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. Stefan
