RE: Merge question
From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 5 Mar 2010 13:08:43 -0500
> Ok after having a few more discussions here's a situation that we face
Um, a merge brings changes from one path to another. You may not fully understand what merge means.
however, if you are saying you want to get John's code to say Branches\Stable then you can do a merge and just choose rev 22.
However, you really shouldn't let dev check in stuff that isn't done into trunk. Bob should create a branch for the issue he is working on and check into that. Once all his work is completed it can be merged into trunk using --reintegrate and then the issue branch can be deleted.
This is an archived mail posted to the Subversion Users mailing list.