|
Title: CS:GO merging... Post by: -El Diablo on June 08, 2012, 11:36:28 AM Once CS:GO is stable with war3source.. how hard would it be to merge it into my current branch (without changing what my branch can do) ?
Can the SVN program merge them without having to do it manually? Title: Re: CS:GO merging... Post by: Ownz on June 08, 2012, 11:49:35 AM i havent done merging before, but consult the merging mechanisms in "the big svn book"
Title: Re: CS:GO merging... Post by: Naris on June 08, 2012, 06:03:08 PM Yes, subversion can merge any changes from the trunk back into your branch.
Usually you would perform the merge on the root directory of your branch (/customstuff/branches/diablo) and merge in the root directory form the trunk, but since the main directory of the trunk is the root directory, which includes your branch, you might have to do it 1 file/directory at a time :( Title: Re: CS:GO merging... Post by: -El Diablo on June 09, 2012, 04:57:58 AM The only real changes I'm worried the main trunk would mess with is the interface and constants inc. I've made update changes to those to allow my branch to include new functions and enums.
|