August 25, 2015 | Posted in: Visual Studio 2013
On the whole merging changesets between code steams goes without any hitches. On occasion you’ll find issues merging, I find in particular designer files, because they are auto generated in the IDE. If you are finding it difficult to merge and you face the same problem, you can merge the changeset across, take the target version (the key bit here) and then manually implement the changes again in the target branch.
It’s by no means ideal, and if you have found a better way of doing this, please share!
For more information on coding merging see https://msdn.microsoft.com/en-us/library/ms181428%28v=vs.120%29.aspx