gitattributes: auto resolve merge conflicts for generated files #3366
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
will-isovalent
added
the
release-note/misc
kevsecurity
approved these changes
Feb 3, 2025
Since our generated files need to be updated via codegen targets after a rebase anyway, it makes no sense to manually resolve conflicts in them with mergetool. Therefore, let's have git automatically choose a dummy merge strategy for our generated files to streamline the process of making rebases. Signed-off-by: William Findlay <[email protected]>
will-isovalent
force-pushed
the
pr/will/auto-merge-generated-files
branch
from
ef925e1 to
ae44bf8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since our generated files need to be updated via codegen targets after a rebase anyway, it makes no sense to manually resolve conflicts in them with mergetool. Therefore, let's have git automatically choose a dummy merge strategy for our generated files to streamline the process of making rebases.