3 ms·
There is an even simpler approach that doesn't involve cherry-pick or rebase. Instead of doing this: ``` checkout f2 git rebase f1 push -fu origin f2 chec
by calderwoodra 6y ago
There is an even simpler approach that doesn't involve cherry-pick or rebase.
Instead of doing this:
```
checkout f2
git rebase f1
push -fu origin f2
checkout f3
git rebase f2
push -fu origin f3
```
Do this instead:
```
git checkout f2
git merge f1
git push
git checkout f3
git merge f2
git push
```
You would follow this same approach if someone merged a PR ahead of yours into master:
```
git checkout master
git pull
git checkout f1
git merge master
git push
```
I stack PRs everyday because of the points mentioned in the article, but haven't found a tool which will automatically rollup merges yet (haven't looked either).
(edit: formatting)