From: Sebastian Pipping <sping@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches
Date: Thu, 08 Dec 2011 21:31:26 +0100 [thread overview]
Message-ID: <4EE11E9E.4000809@gentoo.org> (raw)
In-Reply-To: <20111208194623.GA2416@linux1>
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
next prev parent reply other threads:[~2011-12-08 21:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-27 4:44 [gentoo-catalyst] rfc: merging catalyst git branches William Hubbs
2011-12-08 19:46 ` William Hubbs
2011-12-08 20:31 ` Sebastian Pipping [this message]
2011-12-08 21:42 ` William Hubbs
2011-12-08 23:43 ` Sebastian Pipping
2011-12-09 1:55 ` Jorge Manuel B. S. Vicetto
2011-12-09 2:56 ` Sebastian Pipping
2011-12-09 3:19 ` William Hubbs
2011-12-09 4:42 ` Sebastian Pipping
2011-12-09 16:16 ` William Hubbs
2011-12-09 17:37 ` Matt Turner
2011-12-09 18:38 ` Sebastian Pipping
2011-12-09 18:48 ` Sebastian Pipping
2011-12-10 14:45 ` William Hubbs
2011-12-10 22:15 ` Sebastian Pipping
2011-12-11 0:35 ` Peter Stuge
2012-06-24 23:33 ` Sebastian Pipping
2012-06-25 4:04 ` Matt Turner
2012-07-02 14:55 ` Sebastian Pipping
2012-07-02 21:00 ` Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EE11E9E.4000809@gentoo.org \
--to=sping@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox