6,071
Hi Experts,
We're merging code from NAV2009R2 to NAV2015. We got the target customized object NAV2015 in text format (use NAVUpgradeCmdlets) and going to solve the conflict parts. I would like to know some NAV Code Editors to speed up the process. Thank you for sharing your best practice!
*This post is locked for comments
Thank you Jens!
Totally agree with you.
Hi Khoa,
you're right, it's TortoiseMerge. Usually the files to be opened will be controlled by Source Control. It will be only opened for conflicts, though, otherwise for diff view it's only in 2-file mode. So I guess as a standalone tool it doesn't make enough sense. The idea behind the three-way merge is to compare the source and the target against the newest common ancestor, and propose a merge based on these differences. That's usually the case when you have Source Control like svn, git, mercurial. Using Source Control adds some procedures and rules, and you have to make some preparations, like keeping track of standard releases and cumulative updates. But it's definitely worth it for analysis and merge work.
with best regards
Jens
Sorry for my late response and thank you all!
I was terribly busy and now have time to review tools.
My team already has come back with Merge Tool. But for me, I like TIM Tool of Jose (well-organized, use Microsoft Powershell Scripts) and Diffuse Tool (N views). I will make a test on TIM, I love NAV tools :-)
To Jens, TortoiseIDiff is used to compare pictures. Is it TortoiseMerge? And what should we input in "Base file", "Their file" and "My file"?
Hi Khoa,
I have found TortoiseDiff (from the TortoiseSVN package) to be the most intuitive, fast and ergonomic editor for merging code for me. I use it with mercurial (TortoiseHG) as Source Control now, it's a very powerful combination. It supports three-way merge (best when used with source control)... but it doesn't do NAV syntax checking.
And BTW, you can disable the ribbon on that thing ;-)
with best regards
Jens
Hello!
For merging we use a tool I developed which is based off the cmdlets for NAV merging but giving a user interface and merging projects management and more cool stuff :)
And you can set up your preferred text editors to be used by the app! I personally use diffuse for the 4 way merging (original, modified, target and result with conflicts).
You can check it out here completely for free, open code and all.
msnav.es/merging-information-download
If you finally decide to use let me know. I have a new version I haven't released yet because it's still in testing phase but looks very promising :)
Khoa,
We internally use Mergetool for upgrades and merges, it is much faster as it does auto merge 70-80 % of the code based on how many customization you have, if you are just looking for text editor to compare then Beyond Compare or Araxis tools were very helpful.
Thanks
Suresh
Stay up to date on forum activity by subscribing. You can also customize your in-app and email Notification settings across all subscriptions.
#1
André Arnaud de Cal...
291,280
Super User 2024 Season 2
#2
Martin Dráb
230,214
Most Valuable Professional
#3
nmaenpaa
101,156
Share
Report
All responses (
Answers (