Akka uses single commits for its pull requests, so that changes can be easily understood and rolled back. Pull requests are contained in their own branch. Here's how I updated my single-commit pull request with some changes and resubmitted it.
-
Rebase the last two commits interactively.
git rebase -i HEAD~2
- When asked, squash the latest commit into the previous one.
-
Replace the existing
upstream
branch with the updated one. Use+
to signify that the updated branch isn't based on the old one. (Oftenorigin
is used instead ofupstream
.)git push upstream +wip-2798-ensuring-rich
On step 2 can also fixup (rather than squash) the latest commit to just use the original commit message.
ReplyDelete