Re: [gentoo-catalyst] rfc: merging catalyst git branches

[William Hubbs <williamh@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 1133 bytes --]

On Thu, Dec 08, 2011 at 09:31:26PM +0100, Sebastian Pipping wrote:
> On 12/08/2011 08:46 PM, William Hubbs wrote:
> > 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.

I checked it out with the folks on #git, and they are recommending
that I rename catalyst_2 to master. I was given a series of commands to
do this.

The down side is that this will cause a forced update, so everyone will
have to re-clone the repository.

The target time I am considering for this is Monday, Dec 11, 0:00 utc.
What that means is, everyone needs to have their changes pushed by then,
then I'll make the change and send out an email here once I'm done.
Then, you will have to re-clone your repositories.

Any comments?

Thanks,

William


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]