From: Xavier Noria <fxn_at_hashref.com>
Date: Thu, 25 Mar 2010 11:09:49 +0100
I am using 1.6 and was told that nowadays explicit revision numbers
That is, after you create branch b from trunk, you work on b,
and when you are done in b finally
First, that is correct right?
Alright, assuming it is, I've tried this in the project I am working on, and
svn merge ^/trunk .
instead of being silent says
--- Merging r2 through r2909 into '.'
and then a ton of tree conflicts appear. But that is kind of weird
I am not into svn and do not know what to do. Can anyone guess what
This is an archived mail posted to the Subversion Users mailing list.