[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: SVN 1.6.x - Merge using sparse checkout resulting in tree conflicts

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 22 Feb 2010 23:50:46 +0100

On Mon, Feb 22, 2010 at 02:38:47PM -0800, Srinivas Kotla wrote:
> Hi,
> Did anyone run into issues with merge resulting in tree conflicts when
> using sparse checkouts?
> Some directories that were not checkedout in the working copy were
> marked as tree conflicts after the merge (local delete, incoming edit
> upon merge).

Either merge into a non-sparse working copy, or if you are happy
with the directories missing in your merge result (caution, this is
unusual and most likely *not* what you want) just mark the conflict
as resolved.

Received on 2010-02-22 23:51:56 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.