Re: Implicit keep-alive after reintegrate merge
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 18 Jan 2012 22:37:39 +0000 (GMT)
Branko Čibej wrote:
> On 18.01.2012 14:45, Julian Foad wrote:
(To be sure we're talking about the same thing, here I'm talking about how Subversion decides whether to merge the change "r11" from A onto A_COPY.)
>> (1) try to merge (as we do now), despite knowing it will conflict;
No; I mean in general it will conflict. Yes there are certain simple changes that the three-way text merge function will detect as "looks like that change has already been made here" and auto-resolve it as a no-op, but that's beside the point.
[sorry, can't reply to the rest just now]
This is an archived mail posted to the Subversion Dev mailing list.