On Wed, Jun 12, 2013 at 05:24:39PM +0200, Johan Corveleyn wrote:
> On Wed, Jun 12, 2013 at 3:44 PM, Stefan Sperling <stsp_at_elego.de> wrote:
> > On Wed, Jun 12, 2013 at 03:27:58PM +0200, Johan Corveleyn wrote:
> >> I'd say, just edit the moved file with the incoming content, embedded
> >> in conflict markers, just like what we do for text conflicts. That, I
> >> think, would be as good as possible.
> >
> > That's basically what updating the move is doing anyway.
> > I wouldn't want to apply the incoming changes to the moved file
> > without also clearing the conflict marker.
>
> But that's what we do with text conflicts if you postpone them. We
> modify the working file (with conflict markers), and leave the
> conflict in place.
No. The conflict markers are already there when the resolver runs!
They are the result of a diff3 merge performed during the update.
Received on 2013-06-12 17:46:54 CEST