Merge files in Visual Studio to newer project

From Species File Help
Jump to: navigation, search

Note: This is an incomplete treatment of this topic. Having done this twice today, I thought it would be useful to at least have a helpful stub. mb 11 July 2012

To merge file to newer version:

  • Make sure newer version project is "mapped" and is current workspace
  • Select older version of file in source control
  • Right click, select Branching and merging, then Merge
  • Select Target branch file, Next (source and target branches), Next (version of source item) and/or Finish (perform the merge operation)
  • Merge changes and conflicts in merge tool, save
  • Open newer version project to check in changes
Personal tools

Species Files