You should probably also add --*ignore*-*ancestry* to that merge statement.
On Wed, Nov 17, 2010 at 8:09 AM, Stefan Sperling <s...@elego.de> wrote: > On Wed, Nov 17, 2010 at 11:00:25PM +1100, Gavin Beau Baumanis wrote: > > I have been doing; > > svn merge -r1:head trunk/somefile branches/somefeature/somefile >
