chore: fix

lingodotdev · Nov 16, 2024 · 476fe67 · 476fe67
1 parent 83dd0c1
commit 476fe67
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/action/src/flows/pull-request.ts b/action/src/flows/pull-request.ts
@@ -180,7 +180,7 @@ export class PullRequestFlow extends InBranchFlow {
 
     try {
       // Attempt to merge base branch, preferring our changes in case of conflicts
-      execSync(`git merge origin/${this.config.baseBranchName} --no-edit -X ours`, { stdio: 'inherit' });
+      execSync(`git merge ${this.config.baseBranchName} -X ours`, { stdio: 'inherit' });
 
       // Create a merge commit with custom message
       execSync(`git commit --amend -m "chore: merge ${this.config.baseBranchName} into ${this.i18nBranchName}"`, { stdio: 'inherit' });