Re: Tree conflicts - high-priority User Interface tasks

On Sat, Oct 18, 2008 at 02:00:39PM +0100, Julian Foad wrote:
> * There must be a way to use "svn merge" to merge a required change
> into a WC to resolve a tree conflict. (The merge currently fails if
> there is any conflict already flagged, which is usually the desired
> behaviour, but not when you're trying to resolve a conflict and need to
> use a merge.)

What about making a merge into a tree conflict victim conditional
on the popular --force switch?

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-20 14:55:07 CEST