Re: [PATCH] Add option to resolve conflicts by selecting a specific file (Issue 2784)

"Mark Phippard" <markphip@gmail.com> writes:

> We discussed a bit on IRC. I'd say the conclusion was that the
> current approach is good for resolved command, but for the others, it
> would need to be a hunk-based approached where this option only
> applied to the hunks that were in conflict. Here is a transcript:

Unless i'm missing something, i understood correctly. I still
don't see why it *needs* to be hunk-based, even for
merge/update/switch. I'm certainly not opposed to that
improvement! But, are we letting the perfect be the enemy of the
good? Or maybe handling it by hunk is easier than i think.

-- 
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org