merging adjacent changes
From: Philip Martin <philip.martin_at_wandisco.com>
Date: Mon, 22 Feb 2016 17:23:56 +0000
"Bert Huijben" <bert_at_qqmail.nl> writes:
> Personally I agree that I would like to see a text-conflict raised in
I added the test because we had already, perhaps inadvertently,
Back in 2003 we didn't have 'svn resolve' so resolving a text conflict
We know merge is essentially imperfect or fuzzy, the question is where
1. common first second
A A A
2. common first second
A A A
3. common first second
A A A
4. common first second
A A A
There are probably more cases.
-- Philip Martin WANdiscoReceived on 2016-02-22 18:24:04 CET |
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.