Re: diff3 followups

"Bill Tutt" <rassilon@lyra.org> writes:
> I'd rather have the 'svn resolve' command and force the user to accept
> the result of any merge conflict. This would mirror into a UI action to
> mark the conflict as resolved. (As opposed to VSS's silly question upon
> invoking a Checkin: "Are you sure you've resolved all conflicts?") Make
> the user be a responsible developer and manually have to resolve the
> conflict.

+1 This is easier to implement and explain.

It probably offers more protection than timestamps/checksums on the
working file, too. People can't habituate to a command that they
don't usually have to run.

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 14 04:30:42 2002