subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <>
Subject Re: Unexpected conflicts merging updates from trunk to a branch
Date Thu, 07 Feb 2013 15:09:22 GMT
On Thu, Feb 07, 2013 at 09:19:47AM -0500, Matthew Pounsett wrote:
> I've been running into unexpected tree conflicts when updating branches from the trunk,
after reintegrating to the trunk where and file adds or removes were involved in the reintegrate.
 I expect I'm doing something wrong here, but I haven't been able to figure out what.  Can
someone point me in the right direction?   Here's a simple example that demonstrates my issue.

You cannot keep using the as-is branch after it has been reintegrated.

Please review the entire "Reintegrating a Branch" section again:
and also see the "Keeping a Reintegrated Branch Alive", which discusses
the problem in detail:

This will be much easier in 1.8, see:

View raw message