Am 10.05.2011 um 17:50 schrieb Vincent van Ravesteijn: > > 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).
You mean I should use the term rebase instead of remerge? Currently I don't know the git concepts... I'm trying to understand what happens if I work for 2 or 3 weeks on a bug/feature. Meanwhile 20 bugfixes are applied to BRANCH_2_0_X, how should I know if I have merge conflicts after a while or the other bug fixes are affecting my own work? Stephan
