git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Joshua Jensen <jjensen@workspacewhiz.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: git rebase likes to fail miserably on Mac OS X Lion
Date: Thu, 26 Jan 2012 22:25:23 -0700	[thread overview]
Message-ID: <4F223543.3080903@workspacewhiz.com> (raw)

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

             reply	other threads:[~2012-01-27  5:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-27  5:25 Joshua Jensen [this message]
2012-01-27  7:59 ` git rebase likes to fail miserably on Mac OS X Lion Stefan Haller

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=4F223543.3080903@workspacewhiz.com \
    --to=jjensen@workspacewhiz.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. 
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).