Re: Two people adding the same file - can both versions be merged?
From: <lsuvkne_at_onemodel.org>
Date: 2007-05-11 15:31:30 CEST
I wonder if when svn merge doesn't do exactly what you'd like, you could simply use diff, then the *nix (or cygwin) patch utility.
>>> On Wed, May 9, 2007 at 7:56 am, "Robert Graf-Waczenski" <rgw@lsoft.com> wrote:
>> I think the point is that most of the time, when (if?) two people
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.