Re: Shared branch vs single branch

On 9/23/13 1:04 PM, C M wrote:
> The idea of turning over merging to them seems to be a recipe for
> disaster.

IMHO, merges should be performed by the individual who is most
knowledgeable of the code being merged. When conflicts occur, and they
WILL occur, the individual performing the merge will need to make
decisions about how to resolve those conflicts. Sometimes the knowledge
required is tool usage (handling tree conflicts for example) but at
other times you need to understand what two diverging lines of code are
trying to do in order to make a correct choice.
Received on 2013-09-24 00:30:26 CEST