Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
joellyons opened this issue Nov 9, 2023 · 6 comments · Fixed by #129
Closed

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

joellyons opened this issue Nov 9, 2023 · 6 comments · Fixed by #129
Assignees

Comments

@joellyons
Copy link

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
Copy link
Owner

@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 christianhelle self-assigned this Nov 10, 2023
@christianhelle
Copy link
Owner

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

@joellyons
Copy link
Author

joellyons commented Nov 20, 2023 via email

@christianhelle
Copy link
Owner

christianhelle commented Nov 21, 2023

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

@joellyons
Copy link
Author

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

Excellent! Thank you so much.

@christianhelle
Copy link
Owner

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

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants