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

git rebase likes to fail miserably on Mac OS X Lion

From
Joshua Jensen <jjensen@workspacewhiz.com>
Date
Jan 27, 2012, 05:25 UTC
Message-ID
<4F223543.3080903@workspacewhiz.com>

On 4 different Mac OS X Lion machines, rebasing my commits (I currently have 14 of them) yields either of the following _consistently_ across varied repositories:

     fatal: Unable to create 
'/Users/joshua/src/project/.git/index.lock': File exists.
or:
     error: Your local changes to the following files would be 
overwritten by merge:

^^^ There are no local changes when the rebase begins. This is caused by the rebase.

I have tried both Git v1.7.5.4 and 1.7.8.4.

I use msysGit for the majority of my Git usage, and I do not run into this problem there.

Is there anything to be done? Right now, the only workaround I can think of is to cherry pick changes one at a time as a fake rebase. Ick.

Thanks.
Josh
Next: Stefan Haller
Message 1 of 2 in “git rebase likes to fail miserably on Mac OS X Lion”
  1. Joshua JensenJan 27, 2012
  2. Stefan HallerJan 27, 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.