From: Bernhard Walle <bwalle@suse.de>
To: akataria@vmware.com
Cc: Ingo Molnar <mingo@elte.hu>, LKML <linux-kernel@vger.kernel.org>
Subject: Re: merge conflicts with tip/master
Date: Tue, 24 Jun 2008 20:38:07 +0200 [thread overview]
Message-ID: <20080624203807.232a414a@kopernikus.site> (raw)
In-Reply-To: <1214327937.27577.6.camel@promb-2n-dhcp368.eng.vmware.com>
* Alok Kataria <akataria@vmware.com> [2008-06-24 10:18]:
>
> While working with tip/master...after following the steps in the readme
> @ http://people.redhat.com/mingo/tip.git/readme.txt
>
> I usually do any changes and manage them using "quilt".
> Once the changes are pushed upstream, i do a "quilt pop"
> and generally try a "git pull" to check for any new changes, along with
> the change that was just pushed.
You might also try guilt [1], which is a mix between st-git and quilt.
Just a hint, it does not solve your problem. :)
Bernhard
[1] http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/
--
Bernhard Walle, SUSE LINUX Products GmbH, Architecture Development
next prev parent reply other threads:[~2008-06-24 18:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-24 17:18 Alok Kataria
2008-06-24 18:08 ` Ingo Molnar
2008-06-24 18:38 ` Bernhard Walle [this message]
2008-06-24 18:51 ` Alok Kataria
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=20080624203807.232a414a@kopernikus.site \
--to=bwalle@suse.de \
--cc=akataria@vmware.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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
all inboxes | Powered by JetHome®