> > > So, if a bug is attacked in a branch and this lasts a while you need to > remerge > the BRANCH_2_0_X regularly into your bug fixing branch(es), right? > > Stephan
No. There is no reason to merge BRANCH_2_0_X into a topic branch. If no merge conflicts arise, the two can live happily next to each other. If a merge conflict does arise, you will have to rebase your topic branch on top of BRANCH_2_0_X (which is effectively the same, but conceptually different). Vincent
