Skip to content

Commit

Permalink
use a squash commit instead of merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jprochazk committed Nov 7, 2024
1 parent a5aec9e commit 8038ca2
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/auto_docs_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ jobs:
git fetch origin main
git checkout main
git merge origin/${{ github.event.pull_request.head.ref }}
git merge --squash origin/${{ github.event.pull_request.head.ref }}
git commit -m "${{ github.event.pull_request.head.title }} (#${{ github.event.pull_request.number }})"
commit=$(git rev-parse HEAD)
git checkout docs-latest
if git cherry-pick $commit -m1; then
if git cherry-pick $commit; then
echo "Cherry-pick successful"
exit 0
else
Expand Down

0 comments on commit 8038ca2

Please sign in to comment.