Re: Merge works fine with Turtoise but not with my command line

But no change if I use the option '--force' with the command line..

$> svn merge ^/trunk --force
--- Merging r2 through r5 into '.':
   C file1
A file2
Summary of conflicts:
  Tree conflicts: 1

$> svn st
      C file1
> local obstruction, incoming add upon merge
A + file2

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2362922

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-17 19:44:45 CEST