Fix rebase conflict detection in git 2.26 #10929
Merged
+23
−6
Conversation
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
Git changed the technique used in rebase from simple apply-patches to use merge. This breaks our conflict detection code. Signed-off-by: Andrew Thornton <[email protected]>
6543
approved these changes
Apr 2, 2020
Signed-off-by: Andrew Thornton <[email protected]>
Member
|
@zeripath please send second patch ;) |
6543
approved these changes
Apr 3, 2020
Contributor
Author
|
@6543 So I think the second commit was sent by the time you commented. |
lafriks
approved these changes
Apr 3, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 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.
Git changed the technique used in rebase from simple apply-patches to use merge. This breaks our conflict detection code.
Fix #10928
Signed-off-by: Andrew Thornton [email protected]