Re: KUDOS to the svn team re: voting experience
From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-08-14 18:21:48 CEST
"Hamilton Link" <helink@sandia.gov> writes:
> Better than either automerging or providing one conflict file, "svn
Alternately, you could have simply looked at the conflict markers
> The need to "resolve" the conflicted file once I had written my
Yup, that's exactly the reason we require 'svn resolve'. :-)
> I hope my experience with managing branch dependancies is as nice.
Sure, when you run 'svn merge', the exact same diff3 process runs.
---------------------------------------------------------------------
|
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.