feature-a. You finish it and submit it for review, and then branch off of
feature-ato start working on
feature-bwhich depends on your latest changes.
feature-a, push, and merge. You want to keep
feature-bup to date, so you check it out and run
git rebase origin/master. However, your latest revisions lead to a self merge conflict when trying to rebase
feature-boff of master.
git rebase origin/master, use
git rebase --onto origin/master feature-a.
feature-a, and place them on top of
HEAD." In the common scenario where
feature-ais the only difference between
feature-b, it can be thought of as "drop all changes between