From a628ce60bad29bf080ee98efa6586f95f444e680 Mon Sep 17 00:00:00 2001 From: Ilya Lesikov Date: Tue, 8 Feb 2022 17:29:45 +0300 Subject: [PATCH] fix(dev-mode): dev branch breaking on complex merge conflicts Signed-off-by: Ilya Lesikov --- pkg/true_git/service_branch.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/true_git/service_branch.go b/pkg/true_git/service_branch.go index c0abdd5de7..d6a2de7c21 100644 --- a/pkg/true_git/service_branch.go +++ b/pkg/true_git/service_branch.go @@ -119,7 +119,7 @@ func prepareAndCheckoutServiceBranch(ctx context.Context, serviceWorktreeDir str mergeCmd := NewGitCmd( ctx, &GitCmdOptions{RepoDir: serviceWorktreeDir}, "-c", "user.email=werf@werf.io", "-c", "user.name=werf", - "merge", "--no-edit", "--no-ff", "--allow-unrelated-histories", "-s", "recursive", "-X", "theirs", sourceCommit, + "merge", "--no-edit", "--no-ff", "--allow-unrelated-histories", "-s", "ours", sourceCommit, ) if err = mergeCmd.Run(ctx); err != nil { return fmt.Errorf("git merge of source commit %q into service branch failed: %s", sourceCommit, err)