Git question: Let's say I have two branches:
I'm working on current.
I discover a silly bug from way before, so I branch to a bug fix branch and fix it:
The bug is really from way before "a" and does not particularly depend on anything newer than that.
Now I want to merge the changes only in the bugfix branch
to both current
and to master.
That is, I want the changes in "e" to apply to both "c" and to "d", but I do not
want "b" or "c" to end up in "d", since I'm still in the middle of working on current.
My guess is that I should rebase the bugfix
branch to "a", then merge it with current
But how can I reliably discover the common ancestor to all the branches I want to merge with? And is there perhaps a nifty command to do this automagically? #git