Re: Disabling automatic conflict resolution?

On Mon, Aug 18, 2003 at 07:17:28AM -0700, Wadsworth, Eric (Contractor) wrote:
>
> Perhaps a useful feature would be a --paranoid switch to the "svn up"
> command. This would treat merges like conflicts, I suppose...?

Something like "p4 resolve -v", which should

   "Include conflict markers in the file for all changes between yours
   and base, and between theirs and base. Normally, conflict markers
   are included only when yours and theirs conflict."
                             (perforce manual)

--ben

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 18 16:50:34 2003