5 ms·
# result ... git rebase foo bar # ... resolve conflicts git add content.txt git rebase --continue # HERE is the trick... we have several wa
by stvkoch 11y ago
# result ...
git rebase foo bar
# ... resolve conflicts
git add content.txt
git rebase --continue
# HERE is the trick... we have several ways to make this.
git rebase --onto bar master~3 master
# .. resolve conflicts
git add .
git rebase --continue