Game Development Community

Tlk Merge

by JohnT · in Torque Game Engine · 09/09/2006 (2:15 pm) · 2 replies

@John - trying to follow instructions in your pdf file that accompanied the TLK 1.4 release on how to merge with a previously existing project. In the document, you mention using WinMerge to do a cross-merge but so far I have not seen where this could be done.

I guess my question is: are you using WinMerge for this or are you using a different program

Thanks!
NextNext Thread
PrevPrevious Thread
More from Torque Game Engine


Torque Owner John Kabus (BobTheCBuilder)
#1
09/11/2006 (7:33 am)
I use WinMerge. I usually compare a clean TLK root directory with my project's root directory (making sure I have backups of both). After WinMerge finishes it displays a list of all the differing files. Starting at the top I open the first file, and cross-merge by moving the TLK changes into my project, and the project changes into the clean TLK. After completing the cross-merge both files are identical, which makes it easy to re-compare the files later to verify that I made all of the changes.

Torque 3D Owner JohnT
#2
09/11/2006 (7:46 am)
I thought maybe there was a command I was missing that did this automatically in WinMerge. Guess that was hoping for too much :)

Thanks John,

John T.