You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@subversion.apache.org by Ben Reser <be...@reser.org> on 2004/09/01 21:30:30 UTC

Re: stop doing conflict-producing operations on already conflicted files

On Thu, Aug 26, 2004 at 07:00:25PM -0000, kfogel@tigris.org wrote:
> Putting in unscheduled for now.  If we shouldn't merge into already-conflicted
> files, what should we do instead?

Error out that the file is conflicted.  If the file is conflicted that
means it has conflict markers in it, so it's not going to be possible to
have a logical merge anyway...

-- 
Ben Reser <be...@reser.org>
http://ben.reser.org

"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org