Don't update stack for merge (ever)
#441
Open
Conversation
This file contains 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
Do not run `UpdatePullRequests` when running the `merge` subcommand. Suppose we have local commits: `c1`. We do a git spr update and a PR is created for `c1`. We then create local commits `c2` & `c3`. If we run `git spr merge` then the following happens. 1. `c1` got merged 2. PRs are created for `c2` and `c3` The creation of PRs for `c2` and `c3` is both unexpected and undocumented. The use of `git spr merge` only claims to "merge all the pull requests that are mergeable in one shot". If you want to only merge some of the PRs then `git spr merge -c` is still available. If you want to create PRs for `c2` and `c3` then `git spr update` can still be used. Note: This change was inspired by de380f0.
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.
Do not run
UpdatePullRequestswhen running themergesubcommand.Suppose we have local commits:
c1.We do a git spr update and a PR is created for
c1.We then create local commits
c2&c3.If we run
git spr mergethen the following happens.c1got mergedc2andc3The creation of PRs for
c2andc3is both unexpected and undocumented.The use of
git spr mergeonly claims to "merge all the pull requests that aremergeable in one shot".
If you want to only merge some of the PRs then
git spr merge -cis still available. If you want to create PRs forc2andc3thengit spr updatecan still be used.Note: This change was inspired by de380f0.