From: Joel Soete <soete.joel@scarlet.be>
To: Kyle McMartin <kyle@mcmartin.ca>
Cc: linux-parisc <linux-parisc@vger.kernel.org>
Subject: Re: last git update of parisc-2.6.git failed again to merge???
Date: Mon, 08 Sep 2008 21:16:54 +0000 [thread overview]
Message-ID: <48C59646.3010507@scarlet.be> (raw)
In-Reply-To: <20080907162501.GD20992@phobos.i.cabal.ca>
Kyle,
Kyle McMartin wrote:
> On Sun, Sep 07, 2008 at 11:51:26AM +0000, Joel Soete wrote:
>> Hello Kyle,
>>
>
> The history is non-linear, because I rebased it:
>
Ah ok it's not yet another of my mistakes lol
> git fetch origin; git reset --hard origin/master
>
Cool, I will try on my other clone (there I use http protocol and a b180 and in this figure it takes long hours before the
clone action is finished. And unfortunately I don't have enough disk space to convert this tree in a hg or recent bzr one,
that would probably help me to be convienced that git is well the more effcient vcs, ozn)
> while on your master branch should resolve it. But be careful, it
> will remove any of your local changes.
>
>
Well I just manage few external patch with quilt on another copy of your tree, I so not worry ;<)
Tx again for advises,
J.
prev parent reply other threads:[~2008-09-08 21:16 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
2008-09-08 21:16 ` Joel Soete [this message]
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=48C59646.3010507@scarlet.be \
--to=soete.joel@scarlet.be \
--cc=kyle@mcmartin.ca \
--cc=linux-parisc@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.