From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Ingo Molnar <mingo@elte•hu>, Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org, Junio C Hamano <gitster@pobox•com>,
git@vger•kernel.org
Subject: Re: linux-next: stackprotector tree build failure
Date: Thu, 23 Oct 2008 10:54:54 +1100 [thread overview]
Message-ID: <20081023105454.880e13e2.sfr@canb.auug.org.au> (raw)
In-Reply-To: <alpine.DEB.1.00.0810221908100.22125@pacific.mpi-cbg.de.mpi-cbg.de>
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
Hi Johannes,
On Wed, 22 Oct 2008 19:41:18 +0200 (CEST) Johannes Schindelin <Johannes.Schindelin@gmx•de> wrote:
>
> I think it might be in order to explain how git-rerere works internally:
Thanks for the explanation.
> So I think that you might hit the unfortunate case where two files
> happened to have the same conflicts, but you needed to resolve them one
> way for one file, and another way for the other file.
Which makes perfect sense, unfortunately.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
prev parent reply other threads:[~2008-10-22 23:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-22 2:11 linux-next: stackprotector tree build failure Stephen Rothwell
2008-10-22 4:32 ` Ingo Molnar
2008-10-22 7:21 ` Stephen Rothwell
2008-10-22 7:29 ` Ingo Molnar
2008-10-22 8:27 ` Stephen Rothwell
2008-10-22 8:31 ` Stephen Rothwell
2008-10-22 8:31 ` Ingo Molnar
2008-10-22 17:41 ` Johannes Schindelin
2008-10-22 23:54 ` Stephen Rothwell [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=20081023105454.880e13e2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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