Update create-token-pr.yaml

swisspost · Oct 28, 2024 · 3cc85ee · 3cc85ee
1 parent ebe269c
commit 3cc85ee
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/create-token-pr.yaml b/.github/workflows/create-token-pr.yaml
@@ -28,7 +28,7 @@ jobs:
       - name: Update Tokens Branch
         run: |
           git checkout ${{ github.ref_name }}
-          git merge origin/main -X yours --no-edit
+          git merge origin/main -X ours --no-edit
           git push
         env:
           GITHUB_TOKEN: ${{ secrets.SWISSPOSTDEVS_ACCESS_TOKEN }}