christianhelle / reswcodegen

A Visual Studio Custom Tool for generating a strongly typed helper class for accessing localized resources from a .ResW file.
http://bit.ly/reswcodegen
GNU General Public License v3.0
11 stars 11 forks source link

Updating a generated date in the generated file causes annoying merge conflicts #128

Closed joellyons closed 11 months ago

joellyons commented 12 months ago

The generated .cs files contain a comment at the top that includes the date and time the file was generated. This makes it difficult for merge tools to automatically merge two generated cs files that were both changed recently. Is there an important reason to include the generated date and time in the cs file? If not, it would be nice to remove it to avoid merge conflicts.

I'd be happy to make this change and submit a pull request if you think this is a good idea. Thanks!

christianhelle commented 12 months ago

@joellyons thanks for taking the time to report this

The answer is no, now that you mention it, there is absolutely no reason to add a timestamp to the generated code. This can easily go away.

I would greatly appreciate a pull request and will make sure to get it released to the marketplace as soon as we merge it in

christianhelle commented 11 months ago

@joellyons Have you started on a fix? If not, then I can also do it

joellyons commented 11 months ago

Oops! I got distracted. It's on my to-do list but I haven't started anything. Feel free to bang it out if you have a moment. Thanks! 😊On Nov 20, 2023 12:48 PM, Christian Helle @.***> wrote: @joellyons Have you started on a fix? If not, then I can also do it

—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: @.***>

christianhelle commented 11 months ago

@joellyons I implemented the fix and I expect to release a new version later today

joellyons commented 11 months ago

@joellyons I implemented the fix and I expect to release a new version later today

Excellent! Thank you so much.

christianhelle commented 11 months ago

@joellyons The change were released to the marketplace yesterday as v1.7.15

image