{"thread":{"id":"14419","subject":"Automatic cherry-pick failure","startedAt":"2008-07-12T11:55:07Z","lastAt":"2008-07-12T11:55:07Z","messageCount":1,"participants":["Jelle Geerts"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"83072","messageId":"bf2cff050807120455p2394481bg181debddb86961dd@mail.gmail.com","threadId":"14419","inReplyTo":null,"subject":"Automatic cherry-pick failure","fromName":"Jelle Geerts","fromEmail":"jellegeerts@gmail.com","sentAt":"2008-07-12T11:55:07Z","receivedAt":"2008-07-12T11:55:07Z","isPatch":false,"sender":{"key":"jellegeerts@gmail.com","avatar":null},"body":"Hello,\n\nWhen I tried to `git rebase -i', I changed the first line in the editor from\n'pick' to 'edit'. After the editor exited, git complained:\n  error: Untracked working tree file 'DESIGN.TXT' would be overwritten by merge.\nBut this file is tracked, so first I did `git rebase --abort'.\nI had to use `git config --bool core.ignorecase true' to get around the error.\nIt's because I use Git with Cygwin on an NTFS partition. Only thing I is that\n'core.ignorecase' is undocumented.\n\nAfter getting around the Cygwin specific workaround, I reran rebase. Again, I\nedited the first line from 'pick' to 'edit'. All went well. Then I made the\namendment to the commit with `git commit --amend --author=\"me <me@somewhere>\"'.\nNow, when I typed `git rebase --continue' I got this:\n  error: Entry 'code/src/sys_main.cc' not uptodate. Cannot merge.\n  fatal: merging of trees e3249e935c9ccd790c372aac82b8e097044b1ffe and\nac79e613ed0fe912e0da2c5ccf52f6a540533cb8 failed\n  Automatic cherry-pick failed.  After resolving the conflicts,\n  mark the corrected paths with 'git add <paths>', and\n  run 'git rebase --continue'\n  Could not apply 5c03af9... commit test\n\nI'm not sure what I have to do now, can someone help me with this?\n\n-- Jelle\n"}]}