From: Mike S. <ms...@po...> - 2011-01-24 16:52:38
|
if you're merging a commit from trunk to the 5.4 branch, please use the MergeFromTrunk.sh script, which uses SVN merge tracking, rather than just committing to trunk and committing a second copy to 5.4. it makes merging life a lot harder dealing with conflicts if it's a dupe merge commit than a merge. thanks! ms |