I blog about development using .net, C#, SQL, Windows RT, and other Microsoft technologies.
Disclaimer: All posts are provided "AS IS" with no warranties, confering no rights, and expressing only my personal opinion, not Microsoft's.
While merging merging branches, you may see change types like "merge" and "merge, branch". When you merge an item to a non-existent namespace, this will be a (merge, branch) change type. A (merge) change type occurs when there's a conflict to be resolved and we don't know what other changes may be pended until the conflict is resolved, or when there's no change to neither the file content nor namespace, but the merge history will be updated to establish a merge relationship between source and target or update the latest version merged.