{"thread":{"id":"29451","subject":"git rebase likes to fail miserably on Mac OS X Lion","startedAt":"2012-01-27T05:25:23Z","lastAt":"2012-01-27T07:59:28Z","messageCount":2,"participants":["Joshua Jensen","Stefan Haller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"183161","messageId":"4F223543.3080903@workspacewhiz.com","threadId":"29451","inReplyTo":null,"subject":"git rebase likes to fail miserably on Mac OS X Lion","fromName":"Joshua Jensen","fromEmail":"jjensen@workspacewhiz.com","sentAt":"2012-01-27T05:25:23Z","receivedAt":"2012-01-27T05:25:23Z","isPatch":false,"sender":{"key":"jjensen@workspacewhiz.com","avatar":"https://avatars.githubusercontent.com/u/111687?v=4"},"body":"On 4 different Mac OS X Lion machines, rebasing my commits (I currently \nhave 14 of them) yields either of the following _consistently_ across \nvaried repositories:\n\n     fatal: Unable to create \n'/Users/joshua/src/project/.git/index.lock': File exists.\n\nor:\n\n     error: Your local changes to the following files would be \noverwritten by merge:\n\n^^^ There are no local changes when the rebase begins.  This is caused \nby the rebase.\n\nI have tried both Git v1.7.5.4 and 1.7.8.4.\n\nI use msysGit for the majority of my Git usage, and I do not run into \nthis problem there.\n\nIs there anything to be done?  Right now, the only workaround I can \nthink of is to cherry pick changes one at a time as a fake rebase.  Ick.\n\nThanks.\n\nJosh\n"},{"id":"183172","messageId":"1keiu28.11ei9311hu0d3gM%lists@haller-berlin.de","threadId":"29451","inReplyTo":"4F223543.3080903@workspacewhiz.com","subject":"Re: git rebase likes to fail miserably on Mac OS X Lion","fromName":"Stefan Haller","fromEmail":"lists@haller-berlin.de","sentAt":"2012-01-27T07:59:28Z","receivedAt":"2012-01-27T07:59:28Z","isPatch":false,"sender":{"key":"lists@haller-berlin.de","avatar":null},"body":"Joshua Jensen <jjensen@workspacewhiz.com> wrote:\n\n> On 4 different Mac OS X Lion machines, rebasing my commits (I currently\n> have 14 of them) yields either of the following _consistently_ across\n> varied repositories:\n\nAs far as I can tell, these are two completely unrelated problems.\n\n>      fatal: Unable to create \n> '/Users/joshua/src/project/.git/index.lock': File exists.\n\nIn my experience, this is caused by Xcode 4's builtin git support. It\nhappens when you have your project open in Xcode 4 while you try to\nrebase it.  It doesn't seem to be possible to turn off Xcode's git\nsupport (I never use it), so the only workaround seems to be to close\nthe Xcode project before you rebase.\n\n>      error: Your local changes to the following files would be \n> overwritten by merge:\n\nAs a workaround for this one, try\n\n  git config --global core.trustctime false\n\nThis helps for me, but I have no idea what the implications are or why\nit would be necessary.\n\n\n(Out of town until Feb 5; don't expect timely replies.)\n\n\n-- \nStefan Haller\nBerlin, Germany\nhttp://www.haller-berlin.de/\n"}]}