[darcs-users] Colin Walters blogs on Arch changesets vs Darcs
andrew at pimlott.net
Fri Nov 26 14:22:45 UTC 2004
On Fri, Nov 26, 2004 at 10:12:01AM -0400, Zooko O'Whielacronx wrote:
> On 2004, Nov 25, at 23:31, Andrew Pimlott wrote:
> >The repo has to be in some state after the conflict, and what other
> >state makes sense?
> I think the current working version must always be equal to the
> combination of all patches, followed by any unrecorded changes.
But what is the combination of two patches that both add (and probably
add different contents to) the same file? The natural (if unintuitive)
answer is that neither version of the file exists.
More information about the darcs-users