From: Kyle McMartin <kyle@mcmartin.ca>
To: Joel Soete <soete.joel@scarlet.be>
Cc: Kyle McMartin <kyle@mcmartin.ca>,
linux-parisc <linux-parisc@vger.kernel.org>
Subject: Re: last git update of parisc-2.6.git failed again to merge???
Date: Sun, 7 Sep 2008 12:25:01 -0400 [thread overview]
Message-ID: <20080907162501.GD20992@phobos.i.cabal.ca> (raw)
In-Reply-To: <48C3C03E.2050405@scarlet.be>
On Sun, Sep 07, 2008 at 11:51:26AM +0000, Joel Soete wrote:
> Hello Kyle,
>
The history is non-linear, because I rebased it:
git fetch origin; git reset --hard origin/master
while on your master branch should resolve it. But be careful, it
will remove any of your local changes.
next prev parent reply other threads:[~2008-09-07 16:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-07 11:51 last git update of parisc-2.6.git failed again to merge??? Joel Soete
2008-09-07 16:25 ` Kyle McMartin [this message]
2008-09-08 21:16 ` Joel Soete
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=20080907162501.GD20992@phobos.i.cabal.ca \
--to=kyle@mcmartin.ca \
--cc=linux-parisc@vger.kernel.org \
--cc=soete.joel@scarlet.be \
/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