{"thread":{"id":"22232","subject":"[UI issue + BUG] recovering from rebase aborting due to untracked files","startedAt":"2010-01-15T10:44:22Z","lastAt":"2010-01-15T10:44:22Z","messageCount":1,"participants":["Yann Dirson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"131713","messageId":"ea70c5e3e02a9e9a39384ea417bfa59a.squirrel@intranet.linagora.com","threadId":"22232","inReplyTo":null,"subject":"[UI issue + BUG] recovering from rebase aborting due to untracked files","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2010-01-15T10:44:22Z","receivedAt":"2010-01-15T10:44:22Z","isPatch":false,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"During an interactive rebase, it happened that some testing operations on\none commit created files that were normally added by a later commit,\nleading to the following conflict:\n\n$ git rebase --continue\nerror: Untracked working tree file 'xxxx' would be overwritten by merge. \nAborting\nCould not apply 8a2ea0a... L10n of photo and games.\n$\n\nNo clue is given about what to do next.  It would be nice if one could\njust removes the faulty files, and use \"rebase --continue\". \nUnfortunately, doing the following results in the rebase being prematurely\nfinished with success, with all patches starting with the one causing the\nproblem being silently dropped.\n\nNow it is not so hard for an experienced user to rewind and avoid doing\nthe mistake a second time, but some safeguards would be nice.\n\nDoes anyone with knowledge of rebase internals see what goes wrong and how\nto fix it best ?\n"}]}