Re: Merge from a branch of a branch to trunk, losing files

2015-04-24 Thread Johan Corveleyn
On Tue, Apr 21, 2015 at 7:20 PM, Robert Voliva wrote: > Hello, > > I created a branch off of trunk. Files were added to that branch. A branch > was created off of that branch. Files were added/changed in that branch. > The second branch was merged back to trunk. The files added in the first >

Merge from a branch of a branch to trunk, losing files

2015-04-21 Thread Robert Voliva
Hello, I created a branch off of trunk. Files were added to that branch. A branch was created off of that branch. Files were added/changed in that branch. The second branch was merged back to trunk. The files added in the first branch, before the second branch was cut from it, were not includ