Skip to content

fix: automerge dies when encounters local changes not on remote #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-alpert-os merged 1 commit into from
Mar 17, 2026
Merged

fix: automerge dies when encounters local changes not on remote #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions merge/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ function open_and_merge_pull_request() {
# pushes merge commit
if ! git push origin "${1}"; then
echo "DEBUG: pushing ${GITHUB_REF} merged into $1 failed"
echo "DEBUG: reverting back to origin/${1} so subsequent"
echo "DEBUG: steps can work with a clean working tree"
git reset --hard "origin/${1}"
return 1
fi

Expand Down
Loading