From 221bed0a31ad5c4a5e7e0cadd23819a8659d46a3 Mon Sep 17 00:00:00 2001 From: Benjamin Milan Date: Tue, 14 Jul 2026 14:09:15 +0100 Subject: [PATCH] BWDO-808 fix conflict resolution bug --- src/sc/branching/commands/finish.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sc/branching/commands/finish.py b/src/sc/branching/commands/finish.py index 5c7812f..527a9cd 100644 --- a/src/sc/branching/commands/finish.py +++ b/src/sc/branching/commands/finish.py @@ -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 + # git merge + # 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.") try: