Re: Issue with Orphaned Files After Aborted Rebase
From: Johnny Sheeley <hidden>
Date: 2016-06-15 23:06:29
I began a rebase, and was unable to add two files that appeared as changed (1). When I aborted this rebase, these two files were left in my tree, showing as changed, and did not respond to checkout ‹(2), reset(3), or stash(4). My expectation would be that after a rebase ‹abort, the tree would be returned to the original state pre-rebase. My expectation for checkout and reset is that the tree would be returned to its state based on the last commit. My expectation for stash is that the files would be stashed and thus changes would be reverted. Have I done something wrong/missed something? For reference, feature/RED-599-Bundling was created from feature/fanatics. I¹ll be keeping this repository in this state in case I can provide any additional useful information. Thanks, Johnny (1) https://gist.github.com/sheeley/537f6562e762b288cef8#file-orphaned-txt-L1-L 159 (2) https://gist.github.com/sheeley/537f6562e762b288cef8#file-orphaned-txt-L160 -L186 (3) https://gist.github.com/sheeley/537f6562e762b288cef8#file-orphaned-txt-L187 -L201 (4) https://gist.github.com/sheeley/537f6562e762b288cef8#file-orphaned-txt-L187 -L201 Information 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.