Re: merge and branch questions

2010-06-10 Thread Arpad Ilia
You can use 'svn merge' to merge changesets from the branch back into the trunk. You can also use reintegrate and still keep the branch, though it is not a very good idea since later trunk->branch synchronizations will cause lots of conflicts, as svn will try to merge the reintegration changese

merge and branch questions

2010-06-09 Thread Ralf Haring
Hi, I am relatively new to svn and had some questions about maintaining branches and merging them back to the trunk. The way my env is set up right now, ongoing development is done on the trunk. We have branches corresponding to various releases along the way. When needing to make a fix to an exis