{"thread":{"id":"40302","subject":"Re: Issue with Orphaned Files After Aborted Rebase","startedAt":"2015-09-08T18:00:49Z","lastAt":"2015-09-08T18:00:49Z","messageCount":1,"participants":["Johnny Sheeley"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"269613","messageId":"A76F042CD5DF4D49AA84893E036EB052B9859DC4@JXFQ-EXCH001.footballfanatics.wh","threadId":"40302","inReplyTo":"A76F042CD5DF4D49AA84893E036EB052B9859D93@JXFQ-EXCH001.footballfanatics.wh","subject":"Re: Issue with Orphaned Files After Aborted Rebase","fromName":"Johnny Sheeley","fromEmail":"jsheeley@fanatics.com","sentAt":"2015-09-08T18:00:49Z","receivedAt":"2015-09-08T18:00:49Z","isPatch":false,"sender":{"key":"jsheeley@fanatics.com","avatar":null},"body":"I began a rebase, and was unable to add two files that appeared as changed\n(1). When I aborted this rebase, these two files were left in my tree,\nshowing as changed, and did not respond to checkout ‹(2), reset(3), or\nstash(4).\n\nMy expectation would be that after a rebase ‹abort, the tree would be\nreturned to the original state pre-rebase.\nMy expectation for checkout and reset is that the tree would be returned\nto its state based on the last commit.\nMy expectation for stash is that the files would be stashed and thus\nchanges would be reverted.\n\nHave I done something wrong/missed something?\n\nFor reference, feature/RED-599-Bundling was created from feature/fanatics.\nI¹ll be keeping this repository in this state in case I can provide any\nadditional useful information.\n\nThanks,\nJohnny\n\n(1)\nhttps://gist.github.com/sheeley/537f6562e762b288cef8#file-orphaned-txt-L1-L\n159\n(2)\nhttps://gist.github.com/sheeley/537f6562e762b288cef8#file-orphaned-txt-L160\n-L186\n(3)\nhttps://gist.github.com/sheeley/537f6562e762b288cef8#file-orphaned-txt-L187\n-L201\n(4)\nhttps://gist.github.com/sheeley/537f6562e762b288cef8#file-orphaned-txt-L187\n-L201\n\nInformation contained in this e-mail message is confidential. This e-mail message is intended only for the personal use of the recipient(s) named above. If you are not an intended recipient, do not read, distribute or reproduce this transmission (including any attachments). If you have received this email in error, please immediately notify the sender by email reply and delete the original message.\n"}]}