Skip to content

Commit

Permalink
chore: remove no need force for git push (#1006)
Browse files Browse the repository at this point in the history
Signed-off-by: KeisukeYamashita <[email protected]>
  • Loading branch information
KeisukeYamashita authored Jun 4, 2024
1 parent 90bf6af commit 5604978
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ jobs:
git tag $TAG
git push --atomic origin release $TAG
- name: Commit & push to main
run: git switch main && git cherry-pick release && git push --force
run: git switch main && git cherry-pick release && git push
2 changes: 1 addition & 1 deletion .github/workflows/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ jobs:
- name: Merge main branch to release branch
run: git merge -X theirs main
- name: Git push
run: git push origin release --force
run: git push origin release

0 comments on commit 5604978

Please sign in to comment.