From: Johannes Sixt <j.sixt@viscovery.net>
To: Andreas Ericsson <ae@op5.se>
Cc: Brian Foster <brian.foster@innova-card.com>,
git mailing list <git@vger.kernel.org>
Subject: Re: [Q] merging from one (kernel) stable to another?
Date: Mon, 30 Mar 2009 12:38:43 +0200 [thread overview]
Message-ID: <49D0A133.80503@viscovery.net> (raw)
In-Reply-To: <49D09207.9080407@op5.se>
Andreas Ericsson schrieb:
> A possibly better approach for you is to "git format-patch"
> your own changes and apply them to a clean 2.6.26.8 tree
> instead of trying to merge 2.6.26.8 into 2.6.21.
After you have successfully done *that*, you know how the resulting tree
must look like, and you give it a tag, say "like-this". If you really want
to have a merge, then you can just repeat the merge with your original
branch, at which time you will get tons of conflicts. Now you just 'git
checkout like-this -- .' and you have all your conflicts resolved in the
way you need them.
-- Hannes
next prev parent reply other threads:[~2009-03-30 10:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-30 8:24 [Q] merging from one (kernel) stable to another? Brian Foster
2009-03-30 9:33 ` Andreas Ericsson
2009-03-30 10:38 ` Johannes Sixt [this message]
2009-03-30 11:58 ` Brian Foster
2009-03-30 12:19 ` Johannes Sixt
2009-03-30 12:40 ` Brian Foster
2009-03-30 12:19 ` Andreas Ericsson
2009-03-30 12:51 ` Brian Foster
2009-03-30 13:52 ` Andreas Ericsson
2009-03-30 15:20 ` Ping Yin
2009-03-31 4:20 ` Kris Shannon
2009-03-30 17:31 ` Daniel Barkalow
2009-03-31 7:30 ` Brian Foster
2009-03-30 18:23 ` Uwe Kleine-König
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=49D0A133.80503@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=ae@op5.se \
--cc=brian.foster@innova-card.com \
--cc=git@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).