chore: continue on error in git merge (#1)

.github/workflows/merge-upstream-changes.yml

@@ -14,13 +14,19 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.head_ref }}
-      - uses: fish-actions/[email protected]
-      - run: |
+      - name: git config
+        run: |
           git config user.name mnacamura
           git config user.email [email protected]
+      - name: git merge
+        continue-on-error: true
+        run: |
           git remote add upstream https://github.com/PatrickF1/fzf.fish.git
           git fetch --unshallow upstream main
           git merge --no-ff upstream/main
+      - uses: fish-actions/[email protected]
+      - name: run fzf2sk
+        run: |
           git checkout upstream/main -- ':!tools/' ':!.github/'
           fish tools/fzf2sk.fish
       - uses: stefanzweifel/git-auto-commit-action@v4