fix: automerge dies when encounters local changes not on remote#67
Merged
david-alpert-os merged 1 commit intomasterfrom Mar 17, 2026
Merged
Conversation
if the push of a backmerge fails then the local working copy was left with commits on the current branch ahead of origin we are now capturing that as an error and moving on to try the next backmerge; however that fails now because there is no clean working copy. this commit should reset the failed merge back to match origin and leave the working copy in a better state to try the next backmerge MP-1092 Co-Authored-By: Greg Lary <greg.lary@opensesame.com> Co-Authored-By: Zig Rosinski <zig.rosinski@opensesame.com>
david-alpert-os
deleted the
fix/reset-local-working-copy-after-failure-to-push
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
if the push of a backmerge fails then the local working copy was left with commits on the current branch ahead of origin
we are now capturing that as an error and moving on to try the next backmerge; however that fails now because there is no clean working copy.
this commit should reset the failed merge back to match origin and leave the working copy in a better state to try the next backmerge
MP-1092