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 <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.")
 
             try: