Re: svn reintegrate causing merge conflicts

2010-01-22 Thread Stefan Sperling
On Fri, Jan 22, 2010 at 05:52:24PM -0500, Bob Archer wrote: > > I am encountering an issue with "svn merge --reintegrate" when doing > > round-trip branch-trunk merges. Yes, I know these are problematic, but we > > don't have problems with them except for this one case. > > > > The general scenari

RE: svn reintegrate causing merge conflicts

2010-01-22 Thread Bob Archer
> I am encountering an issue with "svn merge --reintegrate" when doing > round-trip branch-trunk merges. Yes, I know these are problematic, but we > don't have problems with them except for this one case. > > The general scenario is: > 1. Create a new file on the branch. > 2. svn merge --reint