Contents tagged with Version Control
-
Subversion 1.5 brings merge improvements & more
My shop has been using Subversion for a number of years. It is a reliable tool and works well for our team. One area that Subversion could handle better is tracking merge information. Our team is always working on multiple feature branches and merging those changes back into the main line of development. The current merge support works fine (most of the time), but doesn't handle complex situations well.