I just looked through the documentation on how to resolve conflicts,
As a read the proposed work flow,
only the new branch B will be up-to-date (due to the merge in 3), so the steps 4-5 doesn't really make sense. Is it a bug in the documentation, e.g. should branch B be merged into A? Or is there another proposed workflow?
Working with many team member, we experience merge conflicts on a daily basis, so we are looking for the best possible workflow to resolve them.
Hi @Andrey ,
thanks for the update. Is there a reason why you don't do it the other way around? That is,
This way, you avoid the switch-branch-and-drop-changes step.
@emher , Indeed this would give the same result, however the benefit of merging B into A is that the target branch never changes and the auxiliary branches are short-living and can be removed after the merge is done.