|
From: | Markus Schiltknecht |
Subject: | Re: [Monotone-devel] resolving name conflicts; file suturing vs drop |
Date: | Thu, 08 May 2008 13:22:20 +0200 |
User-agent: | Thunderbird 2.0.0.12 (X11/20080227) |
Hi, Stephen Leake wrote:
It depends on the user's intent; there is no way for monotone to know what the right thing to do is here.
Full ACK.
One example of user's intent is here is the "thermostat" use case. C is an early attempt to use one file to provide both the Honeywell and Westinghouse models. But later Abe and Beth realize they need two separate files, so they switch to E. Then the correct solution for F is to drop 1&2 entirely, and keep 1, 2.
Yup.
On the other hand, this could be the "checkout.sh" use case. Then E is simply mistaken, and in F 1, 2 should each be dropped, but 1&2 kept. That's why it must be an ncc.
Correct.
So we need syntax for 'merge --resolve_conflicts' to express either of these resolutions.
Uh.. well, I'm not quite into the UI, yet. But: there might be multiple conflicts...
There are probably other use cases with other resolutions.
Well, there are not that many ways on how to resolve an ncc... Regards Markus
[Prev in Thread] | Current Thread | [Next in Thread] |