Re: How to disable automatic merging...

On Monday, December 10, 2007 3:40 PM -0700 Gus Hart <gus.hart@gmail.com>
wrote:

> Maybe I missed something fundamental about how to use SVN. If I work
> on a project, then 'svn up' before committing, in case someone else
> made changes at the same time, and I get a merged file, how do I see
> what SVN changed for me in that file?

Perhaps one way to accomplish this would be to get *all* merged content
treated as a conflict, and hence marked with conflict markers in the
updated source. The developer would then need to manually issue "svn
resolved" for every file that was updated, after removing the conflict
markers. (I wouldn't use this myself.)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 12 02:07:18 2007