Updating to the latest-n-greatest?
by Mark Storer · in Torque Game Engine · 05/18/2005 (2:35 pm) · 3 replies
Reading the thread "Seperation between engine and demo app?" raised an interesting question in my mind:
How do people merge their own games with the major torque releases (or HEAD, for the masocistic)?
Seperate files? Seperate directory trees? Lots of mental grunting and straining?
How do people merge their own games with the major torque releases (or HEAD, for the masocistic)?
Seperate files? Seperate directory trees? Lots of mental grunting and straining?
About the author
#2
I also use WinMerge and do it by hand.
05/19/2005 (3:43 pm)
Anyway you cut it keeping up with the latest code is not fun. There is no easy answer to it.I also use WinMerge and do it by hand.
#3
Be code literate! Merging is work but it's a lot easier with good tools than pretty much any other approach to keep in sync is. We're working on making Torque easier and easier to work with, so that merges are less likely to involve key code you've modified, but there's always gonna be a task something like this as long as you've got the code...
05/20/2005 (12:20 pm)
Beyond Compare 2 rocks.Be code literate! Merging is work but it's a lot easier with good tools than pretty much any other approach to keep in sync is. We're working on making Torque easier and easier to work with, so that merges are less likely to involve key code you've modified, but there's always gonna be a task something like this as long as you've got the code...
Torque Owner Daniel Allessi
That's exactly what I do.
Edit: I use WinMerge for this.