From: Andrew Wong <andrew.kw.w@gmail.com>
To: Max Horn <max@quendi.de>
Cc: git@vger.kernel.org
Subject: Re: rebase: strange failures to apply patc 3-way
Date: Fri, 8 Mar 2013 10:32:49 -0500 [thread overview]
Message-ID: <CADeaMWp_R0HLwEYn7O3oX4-0OoSeqLfzz_2AYXT-Po88nM4HkQ@mail.gmail.com> (raw)
In-Reply-To: <494292C5-EBD9-487B-8846-9D9DD23ACB83@quendi.de>
On 3/8/13, Max Horn <max@quendi.de> wrote:
> All in all, I suspect that Mac OS X and/or the filesystem (HFS+ with
> journaling, not case sensitive (the default)) might be at fault. Still, this
> is quite puzzling and annoying, and so I still wonder if anybody has any
> insights on this.
When "rebase" errors out at COMMIT A, try manually running "git apply"
on the patch file (rebase-apply/patch) a couple times, and see if the
error occurs randomly. You'd have to do a "reset --hard" to revert the
changes done by "git apply" every time before you run it again. The
error from "git apply" might shed more light on the issue.
next prev parent reply other threads:[~2013-03-08 15:33 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 10:16 rebase: strange failures to apply patc 3-way Max Horn
2013-03-08 11:34 ` Max Horn
2013-03-08 15:32 ` Andrew Wong [this message]
2013-03-08 17:35 ` Max Horn
2013-03-08 18:02 ` Andrew Wong
2013-03-08 18:47 ` Max Horn
2013-03-08 19:20 ` Andrew Wong
2013-03-09 11:26 ` Max Horn
2013-03-09 18:32 ` Andrew Wong
2013-03-09 18:50 ` Andrew Wong
2013-03-10 13:22 ` Max Horn
2013-03-11 19:15 ` Andrew Wong
2013-03-11 21:10 ` Max Horn
2013-03-11 21:34 ` Andrew Wong
2013-03-11 22:20 ` Max Horn
2013-03-11 21:20 ` Max Horn
2013-03-11 22:10 ` Andrew Wong
2013-03-11 22:36 ` Max Horn
2013-03-11 22:54 ` Andrew Wong
2013-03-12 0:15 ` Max Horn
2013-03-12 0:29 ` Max Horn
2013-03-12 0:41 ` John Szakmeister
2013-03-12 0:58 ` Andrew Wong
2013-03-12 1:01 ` Jeff King
2013-03-12 1:03 ` Andrew Wong
2013-03-12 1:10 ` Jeff King
2013-03-12 8:26 ` Heiko Voigt
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=CADeaMWp_R0HLwEYn7O3oX4-0OoSeqLfzz_2AYXT-Po88nM4HkQ@mail.gmail.com \
--to=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
--cc=max@quendi.de \
/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;
as well as URLs for NNTP newsgroup(s).