I use release 1.6.1. Thanks a lot, I will upgrade.
On Jun 17, 10:51 am, Stefan Küng <tortoise..._at_gmail.com> wrote:
> monoc wrote:
> > 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
>
> According to your description on how you created your test repository,
> there shouldn't be any conflict at all when merging.
> Are you using svn 1.6.2? If not, please update to the latest version and
> try again - there have been some bugs fixed related to tree conflicts.
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
>
> signature.asc
> < 1KViewDownload
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2362926
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-17 19:58:28 CEST