git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: rebase fails mid way through due to locally modified file?

From
Peter Krefting <peter@softwolves.pp.se>
Date
Oct 11, 2012, 11:35 UTC
Message-ID
<alpine.DEB.2.00.1210111234150.2378@ds9.cixit.se>
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/
Previous: skillzero@gmail.com
Message 2 of 2 in “rebase fails mid way through due to locally modified file?”
  1. skillzero@gmail.comOct 10, 2012
  2. Peter KreftingOct 11, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.