Hello, When I tried to `git rebase -i', I changed the first line in the editor from 'pick' to 'edit'. After the editor exited, git complained: error: Untracked working tree file 'DESIGN.TXT' would be overwritten by merge. But this file is tracked, so first I did `git rebase --abort'. I had to use `git config --bool core.ignorecase true' to get around the error. It's because I use Git with Cygwin on an NTFS partition. Only thing I is that 'core.ignorecase' is undocumented. After getting around the Cygwin specific workaround, I reran rebase. Again, I edited the first line from 'pick' to 'edit'. All went well. Then I made the amendment to the commit with `git commit --amend --author="me <me@somewhere>"'. Now, when I typed `git rebase --continue' I got this: error: Entry 'code/src/sys_main.cc' not uptodate. Cannot merge. fatal: merging of trees e3249e935c9ccd790c372aac82b8e097044b1ffe and ac79e613ed0fe912e0da2c5ccf52f6a540533cb8 failed Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>', and run 'git rebase --continue' Could not apply 5c03af9... commit test I'm not sure what I have to do now, can someone help me with this? -- Jelle -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
