Skip to content

Commit d57ce2c

Browse files
committed
release.yml
1 parent 65b5bd9 commit d57ce2c

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

.github/workflows/release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,10 @@ jobs:
8080
git add -A
8181
git diff --cached --quiet || git commit --amend --no-verify --no-edit
8282
83-
# Pull latest changes and rebase our commit on top
84-
git pull --rebase origin main
85-
git push
83+
# Refresh the tracking ref before rebasing so push uses the current remote tip.
84+
git fetch origin main:refs/remotes/origin/main
85+
git rebase origin/main
86+
git push origin HEAD:main
8687
8788
- name: Install VS Code extension dependencies
8889
working-directory: ./flowquery-vscode

0 commit comments

Comments
 (0)