script to prefer version from upstream

ston-fi · Jul 2, 2024 · 058f063 · 058f063
1 parent cc2637e
commit 058f063
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -29,8 +29,8 @@ jobs:
       - name: Sync branches
         run: |
           for branch in $(git branch -r | grep upstream | grep -v '\->' | sed 's|upstream/||'); do
-            git checkout $branch || git checkout -b $branch
-            git merge upstream/$branch --allow-unrelated-histories
+            git checkout $branch 2>/dev/null || git checkout -b $branch upstream/$branch
+            git merge upstream/$branch --strategy-option theirs || git checkout --theirs .
           done
 
       - name: Push changes