Skip to content

BWDO-808 fix conflict resolution bug #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenjiMilan merged 1 commit into from
Jul 14, 2026
Merged

BWDO-808 fix conflict resolution bug #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/sc/branching/commands/finish.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,12 @@ def _auto_resolve_manifest_conflicts(
rev_only_change_branches.remove(manifest_repo.active_branch.name)

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.")
Comment on lines 372 to 379

try:
Expand Down