Re: merge disagrees with diff
From: Andreas Krey <a.krey_at_gmx.de>
Date: Fri, 28 Oct 2011 12:58:05 +0200
On Fri, 28 Oct 2011 12:49:35 +0000, Flemming Frandsen wrote:
You didn't get a clean merge; you got a conflict. When you get a conflict,
Here it may simply be that you get the conflict because you want to merge
-- "Totally trivial. Famous last words." From: Linus Torvalds <torvalds@*.org> Date: Fri, 22 Jan 2010 07:29:21 -0800Received on 2011-10-28 12:58:41 CEST
This is an archived mail posted to the Subversion Users mailing list.