Revert "set to theirs"

This reverts commit 60228d9. Signed-off-by: Jinzhe Zeng <[email protected]>
njzjz · Nov 11, 2024 · 30f20f3 · 30f20f3
1 parent 3cce853
commit 30f20f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,3 @@
 .git_archival.txt  export-subst
+# different in different branches
+.nvmrc merge=ours
diff --git a/.github/workflows/sync-branch.yml b/.github/workflows/sync-branch.yml
@@ -28,6 +28,7 @@ jobs:
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git branch ${BRANCH_NAME} -f
           git checkout ${BRANCH_NAME}
+          git config --global merge.ours.driver true
           git merge origin/${{ github.ref_name }} -s ours
           git push origin ${BRANCH_NAME} --force
           PR_URL="$(gh pr list --head "${BRANCH_NAME}" --state open --json url --jq .[].url)"