Merged
Conversation
from the docs: Run 3-way file level merge for text files, but take lines from both versions, instead of leaving conflict markers. This tends to leave the added lines in the resulting file in random order and the user should verify the result. Do not use this if you do not understand the implications.
Member
Author
|
Before, got this merge conflict: After, no conflict, changelog ended up like: |
Contributor
|
We use the same on the beats side: https://github.com/elastic/beats/blob/master/.gitattributes The only problem we encounter from time to time on cherry picks for backports that some lines are "sneaked" in. Meaning an other line is added to the commit which should not be there. But that is normally catched with the review. |
simitt
pushed a commit
to simitt/apm-server
that referenced
this pull request
Jan 8, 2018
from the docs: Run 3-way file level merge for text files, but take lines from both versions, instead of leaving conflict markers. This tends to leave the added lines in the resulting file in random order and the user should verify the result. Do not use this if you do not understand the implications.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
from the docs:
Run 3-way file level merge for text files, but take lines from both
versions, instead of leaving conflict markers. This tends to leave the
added lines in the resulting file in random order and the user should
verify the result. Do not use this if you do not understand the
implications.