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

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

From: monoc <frederic.ville_at_gmail.com>
Date: Wed, 17 Jun 2009 10:44:07 -0700 (PDT)

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


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-17 19:44:45 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.