|EGit continually disallows me to switch away from branch [message #1797873]
||Wed, 07 November 2018 20:45
| David M. Karr
Registered: July 2009
Version: 2018-09 (4.9.0)|
Build id: 20180917-1800
I was doing work on a pull request branch of a project. I discovered I had to make a change directly in the master branch, so I selected "Switch to" and selected "master". It then presented a "Checkout conflicts" dialog, saying "the files shown below have uncommitted changes ...". There's only a "index.ts" file in the list. So, I then click "Reset". I see "Resetting to HEAD" in the status line for a few seconds. Then, the same "Checkout conflicts" dialog reappears, listing the same file. I select "Reset". Same result.
I then tried a similar action, by simply right-clicking on the repository in question and selecting "Reset..." with "Hard" selected. I let the process complete. While this was running, I had the staging view visible, and even after the reset operation completed, I could still see the "index.ts" file in the "Unstaged changes" list, with a "?" next to it.
How do I get out of this loop?
Powered by FUDForum
. Page generated in 0.01573 seconds