Merge pull request #24489 from storybookjs/fix-merge-conflict-handling

Release tooling: Fix not handling merge conflicts
storybookjs · Oct 19, 2023 · 6917c45 · 6917c45
2 parents d996aaf + c13e5b2
commit 6917c45
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.github/workflows/prepare-non-patch-release.yml b/.github/workflows/prepare-non-patch-release.yml
@@ -144,6 +144,7 @@ jobs:
           git checkout --ours .
           git add .
           git commit --no-verify -m "Merge latest-release into version-non-patch-from-${{ steps.bump-version.outputs.current-version }} with conflicts resolved to ours [skip ci]"
+          git push origin version-non-patch-from-${{ steps.bump-version.outputs.current-version }}
 
       - name: Generate PR description
         id: description