Repository navigation
pr.sh: leave a diverged local main alone after the merge - #17
Merged
Merged
Conversation
After a release merge, pr.sh switched to the local main and fast-forwarded it. When that main held unpushed commits (or was checked out in another worktree), the pull failed and the script stopped before waiting for the release run. It now takes over the local main only when main can follow origin/main; otherwise it continues detached on origin/main and leaves main as it is.
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
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.
After the merge,
pr.shnow switches to the localmainonly when it is an ancestor oforigin/main; otherwise it continues detached onorigin/mainand leavesmainuntouched (seen with studio: a local main with unpushed commits stopped the script before it waited for the release run). Test plus mutation check.