fix: assure that blob merges recognize conflicts in cojunction with empty bases. #2207
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
…mpty bases. Previously, there were special cases that would cause it to auto-merge conflicts even though it shouldn't. This is now fixed just by removing the special case entirely, which seems unexpected in any of the test-suite.
Byron
commented
Oct 7, 2025
Comment on lines
-118
to
-122
| if their_hunks.is_empty() { | ||
| write_hunks(our_hunks, input, ¤t_tokens, out); | ||
| } else if our_hunks.is_empty() { | ||
| write_hunks(their_hunks, input, ¤t_tokens, out); | ||
| } else { |
There was a problem hiding this comment.
@Caleb-T-Owens Removing this special case resolved the issue you discovered. Turns out it was entirely unnecessary, and besides the test-case that validates it specifically, there was only one more failure due to that in existing tests, and as it was already a deviation, it was overlooked.
There was a problem hiding this comment.
Neat, thank you for looking into this!
2 tasks
|
Forcing merge as Windows has weird errors that seem related to … OS flakiness. |
Byron
added a commit
to gitbutlerapp/gitbutler
that referenced
this pull request
Oct 7, 2025
|
Regarding the Windows failures: I haven't seen that one before! I don't have time to look into it now but I'll try to do so later. I'm also reruning the test to see if it happens again. Maybe there is a problem on the runner? |
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.
Previously, there were special cases that would cause it to auto-merge conflicts even though it shouldn't.
This is now fixed just by removing the special case entirely, which seems unexpected in any of the test-suite.