{"thread":{"id":"42026","subject":"Commit empty during rebase 2.8.1 windows","startedAt":"2016-04-14T15:39:17Z","lastAt":"2016-04-14T15:39:17Z","messageCount":1,"participants":["Aaron Mell"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"283449","messageId":"CAO0Hcd+Ygd_3n_xvQRB9dtuezhRKpxwuvAgqeGgQ9QZ-_b8uhQ@mail.gmail.com","threadId":"42026","inReplyTo":null,"subject":"Commit empty during rebase 2.8.1 windows","fromName":"Aaron Mell","fromEmail":"amell@alkamitech.com","sentAt":"2016-04-14T15:39:17Z","receivedAt":"2016-04-14T15:39:17Z","isPatch":false,"sender":{"key":"amell@alkamitech.com","avatar":null},"body":"So twice now during this particular rebase I have had this happen. All of\nthe work in this commit after being applied is gone. The only caveat is\nthat I had sourcetree running at the time, and I wonder if that is\nsomehow causing the\nissue.\n\n\naaron@aaron MINGW64 /c/src/FORB (mybranch|REBASE 12/42)\n$ git rebase --continue\nApplying: Commit1\nApplying: Commit2\nUsing index info to reconstruct a base tree...\n\nmy changed files were here\n\n.git/rebase-apply/patch:59: trailing whitespace.\nInsert Into\n.git/rebase-apply/patch:60: trailing whitespace.\ncore.Provider\n.git/rebase-apply/patch:61: trailing whitespace.\n(ProviderTypeId, Name, Description, AssemblyInfo, CreateDate)\n.git/rebase-apply/patch:66: trailing whitespace.\n\n.git/rebase-apply/patch:72: trailing whitespace.\n\nwarning: squelched 41 whitespace errors\nwarning: 46 lines add whitespace errors.\nFalling back to patching base and 3-way merge...\nerror: The following untracked working tree files would be overwritten by\nmerge:\nfile1\nfile2\nPlease move or remove them before you can merge.\nAborting\nerror: Failed to merge in the changes.\nPatch failed at commit2\nThe copy of the patch that failed is found in: .git/rebase-apply/patch\n\nWhen you have resolved this problem, run \"git rebase --continue\".\nIf you prefer to skip this patch, run \"git rebase --skip\" instead.\nTo check out the original branch and stop rebasing, run \"git rebase\n--abort\".\n\n\naaron@aaron MINGW64 /c/src/FORB (mybranch|REBASE 12/42)\n$ git status\nrebase in progress; onto 210fcac\nYou are currently rebasing branch 'mybranch' on '210fcac'.\n(all conflicts fixed: run \"git rebase --continue\")\n\nnothing to commit, working directory clean\n"}]}