fix: fix

lingodotdev · Nov 16, 2024 · 316508b · 316508b
1 parent 9cc1edd
commit 316508b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/action/src/flows/pull-request.ts b/action/src/flows/pull-request.ts
@@ -188,7 +188,7 @@ export class PullRequestFlow extends InBranchFlow {
     }
 
     // Attempt to merge base branch, preferring base branch changes in case of conflicts
-    execSync(`git merge ${this.config.baseBranchName} --allow-unrelated-histories -X ours --no-commit`, { stdio: 'inherit' });
+    execSync(`git merge ${this.config.baseBranchName} -s recursive -X theirs --allow-unrelated-histories --no-commit`, { stdio: 'inherit' });
     // Rollback changes in target files
     for (const file of targetFiles) {
       execSync(`git checkout -- "${file}"`, { stdio: 'inherit' });

diff --git a/file1.md b/file1.md
@@ -0,0 +1,3 @@
+# File 1
+
+This is file 1.
diff --git a/file2.md b/file2.md
@@ -0,0 +1,3 @@
+# File 2
+
+This is file 2.