From: Peter Krefting <peter@softwolves.pp.se>
To: skillzero@gmail.com
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: rebase fails mid way through due to locally modified file?
Date: Thu, 11 Oct 2012 12:35:22 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.00.1210111234150.2378@ds9.cixit.se> (raw)
In-Reply-To: <CANRUUDNoUNMy1qHkYt-_wwxGtWrRY9vi8-CjzY8WhJ2gur+zTg@mail.gmail.com>
skillzero@gmail.com:
> I frequently see rebase fail after applying several commits because
> git thinks there are local changes.
What operating system are you running on? I have seen simlar issues on
Windows, which has a case-insensitive file system, in repositories
where file names have either changed just the casing of their names,
or there has been several files where the only difference in names
were only character casing.
--
\\// Peter - http://www.softwolves.pp.se/
prev parent reply other threads:[~2012-10-11 11:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-10 0:31 rebase fails mid way through due to locally modified file? skillzero
2012-10-11 11:35 ` Peter Krefting [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
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=alpine.DEB.2.00.1210111234150.2378@ds9.cixit.se \
--to=peter@softwolves.pp.se \
--cc=git@vger.kernel.org \
--cc=skillzero@gmail.com \
/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).