Code Merging Utilities
by James Laker (BurNinG) · in General Discussion · 03/04/2009 (12:05 pm) · 2 replies
Can anyone suggest a good code merging utility.
All my code in TGEA v1.7.0 was commented with //JLAKER
Winmerge I can't seem to jump the next file with shortcuts which makes it just as painful.
Anyone have some info on this or is it back to Find Next in Entire Solution?
All my code in TGEA v1.7.0 was commented with //JLAKER
Winmerge I can't seem to jump the next file with shortcuts which makes it just as painful.
Anyone have some info on this or is it back to Find Next in Entire Solution?
#2
Generally my process is:
1. Compare two subfolders
2. Sort results on Comparison results such changed files are at the top and all together
3. start at top hit enter to go into the module
4. ALT + Cursor down to jump to next difference, Alt+left or Alt+right to copy changes
5. When finished with that module Ctrl+S to save, then Ctrl+f4 to close window.
6. Cursor down and hit enter to move to next module.
7. Goto step 4.
Does take a little to get used to it but I can fly through merging systems (sometimes a little too fast and I have to redo things)
03/06/2009 (2:30 am)
I've always used WinMerge for things but Beyond Compare is supposed to be really good as well.Generally my process is:
1. Compare two subfolders
2. Sort results on Comparison results such changed files are at the top and all together
3. start at top hit enter to go into the module
4. ALT + Cursor down to jump to next difference, Alt+left or Alt+right to copy changes
5. When finished with that module Ctrl+S to save, then Ctrl+f4 to close window.
6. Cursor down and hit enter to move to next module.
7. Goto step 4.
Does take a little to get used to it but I can fly through merging systems (sometimes a little too fast and I have to redo things)
Torque Owner Nikos Beck