Skip to content

Commit

Permalink
Update readme with merge method
Browse files Browse the repository at this point in the history
fixes: #227

commit-id:a773219d
  • Loading branch information
ejoffe authored and Eitan Joffe committed Jun 4, 2022
1 parent 2f409a5 commit ef4add6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ Use **git spr status** to see the status of your pull request stack. In the foll
Merging Pull Requests
---------------------
Your pull requests are stacked. Don't use the GitHub UI to merge pull requests, if you do it in the wrong order, you'll end up pushing one pull request into another, which is probably not what you want. Instead just use **git spr merge** and you can merge all the pull requests that are mergeable in one shot. Status for the remaining pull requests will be printed after the merged requests.
In order to merge all pull requests in one shot without causing extra github checks to trigger, spr finds the top mergable pull request. It then combines all the commits up to this pull request into one single pull request, merges this request, and closes the rest of the pull requests. This is a bit surprising at first, and has some side effects, but no better solution has been found to date.

```shell
> git spr merge
Expand Down

0 comments on commit ef4add6

Please sign in to comment.