BWDO-808 fix conflict resolution bug#67
Merged
BenjiMilan merged 1 commit intoJul 14, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
Fixes BWDO-808 by correcting the manifest conflict auto-resolution behavior during finish, ensuring the merged manifest keeps the version from the branch being finished (rather than the target branch) when resolving revision-only conflicts.
Changes:
- Switch manifest auto-conflict resolution from
git checkout --ours <path>togit checkout --theirs <path>in the manifest repo. - Add inline documentation explaining why
--theirsis the correct choice given git-flow’s merge direction (target branch checked out, finishing branch merged in).
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
372
to
379
| for path in manifest_repo.index.unmerged_blobs().keys(): | ||
| manifest_repo.git.checkout("--ours", path) | ||
| # Git Flow performs: | ||
| # git checkout <target branch> | ||
| # git merge <branch being finished> | ||
| # At this point HEAD is the target branch ("ours"), so use `--theirs` to keep | ||
| # the version from the branch being finished. | ||
| manifest_repo.git.checkout("--theirs", path) | ||
| manifest_repo.git.commit("-am", "Automatic conflict resolution.") |
BenjiMilan
deleted the
feature/BWDO-808_bugfix_automatic_conflict_resolution
branch
July 14, 2026 13:14
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
https://ccp.sys.comcast.net/browse/BWDO-808