Game Development Community

CVS and my game

by Neil Marshall · in Torque Game Engine · 12/12/2001 (11:43 am) · 1 replies

I've started working on my game, now when I go to update from CVS, it is my understanding that there is some way to merge the changes from the server with my client side changes. How exactly do you get it to do that? Does it do it automatically? How reliable is it? Will it mess up my code at all?

I've only ever used the basic features of visual source safe and wincvs is mighty confusing to me :)
NextNext Thread
PrevPrevious Thread
More from Torque Game Engine


Torque Owner AIDan
#1
12/12/2001 (1:39 pm)
When you update torque, all changes are merged with your existing files.

Your files are kept as a copy, so if the merge fails, you still can merge it by yourself.