Dynamics NAV - How to use Mergetool to merge Code

http://mergetool.com/addin_e/faq/FAQ_MERGETOOLTRAINING_WEB.htm

• Download Mergetool and extract it
• Look for the appropriate fob file to import to your NAV instance
• Read the Readme in the extract to get the version number list
• MGTx.xx.xx 7.10.fob = NAV 2013 R2
• Create a new Database
• Nav Admin>New>Database
• Restore your old database into the new database
• Import the Mergetool objects into the new database
• Recompile all objects
• Search for Mergetool
• Click Versions to initialize values
• Import all NEW text Codeunits and give them a version name
• Import all OLD text Codeunits and give them a different version name
• Import all BASE text Codeunits from the sample company of the final version you wish to merge into
• Create a Blank Version MERGED to dump the final merged objects into
• Compare the NEW and OLD
• Click on Compare and look through the code line by line to determine what changes were made
• Use Lines Log to see all differences
• or Line Compare to see both files
• This will give you an idea of how likely the files will merge correctly
• Click merge
• Select Old Version as BASE
• New Version as OLD
• Custom Version as NEW
• New Custom as MERGED
• Add new version = first
• Skip if manual = true
• Copy added new objects = true
• Copy added custom objects = true
• After it runs through once, set skip if manual to false, and run it again to see all the manual changes