Update release.yml

Emiliopg91 · Sep 26, 2024 · cd8ae15 · cd8ae15
1 parent 9c006ab
commit cd8ae15
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -79,8 +79,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git merge -X theirs main --allow-unrelated-histories
+          git merge -X theirs main
           git push origin HEAD:develop --force
+          git checkout main
 
   publish:
     if: github.ref == 'refs/heads/main'