Apparently, all you need to do is... make changes to your heart's content on A
. rebase master from the new branch A
and merge this all back into master (--no-ff).
then rebase master from B
, and the changes are in!! git does a very clever 3-way merge when replaying changes has failed. so it's incredibly easy to have all the changes you want from both the new A
, and master
on to branch B
or new B
.
repeat steps as necessary.
if you do run into duplicate commits, just do git rebase --skip
like it tells you :)