merge: fix ours/theris

antgroup · Dec 17, 2024 · c8acb26 · c8acb26
1 parent 0746443
commit c8acb26
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/zeta/merge_tree.go b/pkg/zeta/merge_tree.go
@@ -221,12 +221,12 @@ func (r *Repository) mergeTree(ctx context.Context, into, from, base *object.Com
 		return nil, err
 	}
 	r.DbgPrint("merge from %s to %s base: %s", from.Hash, into.Hash, base0)
-	a, err := from.Root(ctx)
+	a, err := into.Root(ctx)
 	if err != nil {
 		die_error("read tree '%s:' %v", from.Hash, err)
 		return nil, err
 	}
-	b, err := into.Root(ctx)
+	b, err := from.Root(ctx)
 	if err != nil {
 		die_error("read tree '%s:' %v", into.Hash, err)
 		return nil, err