I have two feature branches: featureA and featureB. FeatureA is complete, but not merged into trunk because it\'s untested and we\'re not ready to test it yet.
For you wpf silverlight people who are working with source control that allows merging.What is the best software to use for merging?I am more worried about the xaml then I am the code because this has
加载中,请稍侯......