On 12/08/2011 08:46 PM, William Hubbs wrote: >> [..] >> >> If we are not interested in the 3.0 code, we should probably find a way >> to revert all of it from master with one commit then rebase the 2.0 >> branch on master and move it back there. > > If no one objects, I will look into doing this next week; the catalyst_2 > code should move to master since there doesn't appear to be any work > going on for releasing catalyst 3. > > Comments?
Sounds like you are going for complete replacement. Good move. The cleanest way to do this this in Git may be: # git checkout master # git merge -s theirs catalyst_2 Haven't tested it though. Best, Sebastian
