Skip to content

Commit

Permalink
ci: use merge no-ff instead of rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
dgellow committed Aug 28, 2023
1 parent d4ddebf commit d67f3bf
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
git config --global user.name "Stainless Bot"
git config --global user.email "stainless-bot@users.noreply.github.com"
git checkout release
git rebase -Xtheirs main
git merge --no-ff main
- name: Setup Node.js
uses: actions/setup-node@v2
Expand All @@ -43,7 +43,7 @@ jobs:
run: |
git add ./build
git commit -m "Build sources"
git push
git push origin release
- name: Create GitHub Release
uses: softprops/action-gh-release@v1
Expand Down

0 comments on commit d67f3bf

Please sign in to comment.