Tree conflicts on files added to the branch, then merged into trunk, then merged back into the same branch

Hello, The situation: file is added and committed to a branch, then the same revision is merged into trunk. After that, the range of revisions are merged from trunk back to the same branch which results in a tree conflict on the added file. My understanding of svn:mergeinfo isn't consistent with t

Re: Tree conflicts on files added to the branch, then merged into trunk, then merged back into the same branch

t aware of such tools. So far I had the best merging experience with Git (which handles the described case without any difficulty). On Tue, Sep 7, 2010 at 2:17 PM, Stefan Sperling wrote: > On Tue, Sep 07, 2010 at 12:11:51PM +0300, Vadim wrote: > > Hello, > > > > The situation