|Subject:||Re: [Monotone-devel] cooperative/parallel/resumed merging|
|Date:||Tue, 22 Jun 2004 08:46:13 +0200|
|User-agent:||Mozilla/5.0 (X11; U; Linux ppc; de-AT; rv:1.6) Gecko/20040414 Debian/1.6-5|
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!]?
|[Prev in Thread]||Current Thread||[Next in Thread]|