Auto-merge the version-history file. #3820
Merged
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
See http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/ Signed-off-by: Greg Greenway <ggreenway@apple.com>
|
I recently read about how to configure things like this in git, and thought it might be useful. I don't think github will honor it, unfortunately, but local git merges will benefit. Thoughts on whether this is a good idea? |
htuch
approved these changes
Jul 9, 2018
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.
See http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
Signed-off-by: Greg Greenway ggreenway@apple.com
Risk Level: Extra-low
Testing: Manually tested a conflicting merge