git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: skillzero@gmail.com
To: Git Mailing List <git@vger.kernel.org>
Subject: rebase fails mid way through due to locally modified file?
Date: Tue, 9 Oct 2012 17:31:19 -0700	[thread overview]
Message-ID: <CANRUUDNoUNMy1qHkYt-_wwxGtWrRY9vi8-CjzY8WhJ2gur+zTg@mail.gmail.com> (raw)

I frequently see rebase fail after applying several commits because
git thinks there are local changes. Before the rebase started, there
were no local changes and after the rebase fails, doing a git status
doesn't show any locally modified files. I was seeing this on git
1.7.x and I also tried updating to git 1.8rc1 and it fails there too.
I see progress like this:

--
Applying: Commit X
Applying: Commit Y
Applying: Commit Z
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
	MyFile.h
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0013 Commit A
The copy of the patch that failed is found in:
   /Source/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
--

If I git rebase --abort then retry, it usually fails again, but
sometimes on a different file. Once in a while, retrying will succeed.

Is this a known issue? I can't make the source for my repo available,
but is there some way I can provide more info to help narrow this
down?

             reply	other threads:[~2012-10-10  0:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-10  0:31 skillzero [this message]
2012-10-11 11:35 ` rebase fails mid way through due to locally modified file? Peter Krefting

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CANRUUDNoUNMy1qHkYt-_wwxGtWrRY9vi8-CjzY8WhJ2gur+zTg@mail.gmail.com \
    --to=skillzero@gmail.com \
    --cc=git@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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).