Skip to content


Browse files Browse the repository at this point in the history
fix(dev-mode): dev branch breaking on complex merge conflicts
Signed-off-by: Ilya Lesikov <>
  • Loading branch information
ilya-lesikov committed Feb 8, 2022
1 parent 377ebbe commit a628ce6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/true_git/service_branch.go
Expand Up @@ -119,7 +119,7 @@ func prepareAndCheckoutServiceBranch(ctx context.Context, serviceWorktreeDir str
mergeCmd := NewGitCmd(
ctx, &GitCmdOptions{RepoDir: serviceWorktreeDir},
"-c", "", "-c", "",
"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)
Expand Down

0 comments on commit a628ce6

Please sign in to comment.