Re: Patch command execution

"Jay Freeman \(saurik\)" <saurik@saurik.com> writes:
> What _is_ getting to me is how everyone seems to think that conflict
> resolution happens once in a blue moon. Most of what I do with CVS is
> conflict resolution: when I merge changes that Fyodor made to nmap into
> my repository (I keep a complex, semi-popular patch to nmap going) I am
> sitting around just resolving conflicts for a while. It's hardly ever
> that I do an update on our 3D engine repository that there isn't some
> silly conflict.

Don't worry -- many developers here do lots of conflict resolution. I
don't think it's going to get relegated to the "rarely used feature"
corner anytime soon. :-)

Ex-Mergemaster,
-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006