From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Mark A. Greer" <mgreer@mvista.com>
Cc: linuxppc-dev <Linuxppc-dev@ozlabs.org>,
Paul Mackerras <paulus@samba.org>
Subject: Re: Do we need to reset the master branch?
Date: Fri, 20 Jul 2007 01:27:08 +1000 [thread overview]
Message-ID: <20070720012708.91c77527.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20070719151746.GB20538@mag.az.mvista.com>
Hi Mark,
On Thu, 19 Jul 2007 08:17:46 -0700 "Mark A. Greer" <mgreer@mvista.com> wrote:
>
> I did a git-pull this morning but it had a conflict. Should I have
> reset it to something?
What did you pull it into? There were conflicts with Linus' tree in the
last merge, so there may be conflicts with master as well. I am sure
Paul will pull Linus's tree back into his master branch when he returns
which should resolve the conflicts.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
next prev parent reply other threads:[~2007-07-19 15:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-19 15:17 Do we need to reset the master branch? Mark A. Greer
2007-07-19 15:27 ` Stephen Rothwell [this message]
2007-07-19 15:32 ` Mark A. Greer
2007-07-19 15:44 ` Stephen Rothwell
2007-07-19 15:46 ` Stephen Rothwell
2007-07-19 15:58 ` Mark A. Greer
2007-07-19 15:58 ` Mark A. Greer
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=20070720012708.91c77527.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Linuxppc-dev@ozlabs.org \
--cc=mgreer@mvista.com \
--cc=paulus@samba.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