Re: [Monotone-devel] cooperative/parallel/resumed merging

[Christof Petig]

Christof Petig schrieb:
> graydon hoare schrieb:
> > - doing a "partial merge" and committing the results - doing a merge
> > into the working copy, looking around for a bit, touching it up,
> > committing
> >
> > for the former, I think I prefer what oxygene suggested: make a
> > conservative "best merge possible" node, with two children containing
> > the "residual" non-merged parts.
>
>
> While I'd love to commit the nonconflicting parts, the resulting 
> manifest will not compile most of the time when there are conflicts in 
> some files and clean merges in others. Partially resolved manifests 
> should get a cert "don't use me except when merging".

I don't think that a "best merge possible" node would be easily 
designed: Which version of the conflicting files do you include in this 
manifest, the right branch or the left branch or the common ancestor 
[likely the best solution for a future 3way merge but the least expected!]?

   Christof