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

SVN 1.8, Confused by tree conflict Edit Conflicts output

From: Greg Creager <greg.creager_at_hp.com>
Date: Wed, 18 Sep 2013 14:00:14 -0700 (PDT)

Using the new 1.8 merge and have tree conflicts with both files and a directory. For each case I get the same popup (see attached), basically says that the last merge operation tried to do something but file/directory was obstructed.

Two issues:
1) I was confused by what 'obstructed' means, I redid the merge from a svn command client and was given info that an object of that name already existed.

So I am guessing that is what 'obstructed' means, the file/folder already exists correct?

2) The only 'option' I am given is: accept current working copy state (mark as resolved).

I am confused by this, that basically says keep mine, ignore theirs, where before we could choose. How do we get changes from the source file, merge each file after the merge with no history?

Any help here would be appreciated.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2013-09-18 23:00:21 CEST

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

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