Re: Collaborative conflict resolution feature request

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 15, 2020, 16:57 UTC
Message-ID: <xmqq1rmgxo67.fsf@gitster.c.googlers.com>
In-Reply-To: <c4ebf430-a69d-3d46-bfb9-37c9ece9f519@iee.email>

Philip Oakley <philipoakley@iee.email> writes:

> It could be effectively a special strategy. IIUC the '--' separator is
> already supported by the underlying parser code, so may not be that
> hard? (perhaps a local contribution to the codebase;-). Just a thought.

Assuming that there are paths A and B that would leave conflict in an attempted merge between commits X and Y, you somehow resolve the conflict in A and leave B unresolved, what would you pass to the other person and ask to resolve the conflicts in B? It cannot be a merge commit that records X and Y as its parents and a single tree object as the result, because the whole point of this is that you do not even know what to record for B.

I think the most important and useful part of this is to design the data format used for that task of passing from you to the other person. The way to specify which paths are yours etc. are much less interesting and trivial part of the story, I would think.