Short Answer
Got to your .git folder and delete rebase-merge folder then restart Visual Studio. Restart is required as the screen does not update.
RCA
The complicated part is that I was troubleshooting a separate issue where we get ghost files appearing for apparently no reason but related to white-spaces. I have a potential solution but it only impacts the main branch. Everyone's current branches will continue to have this ghost file issue.
One of the biggest problem with the ghost file issue is that you cannot remove it from the staged or unstaged list. When executing the rebase, it will stash the change. The ghost changes will be stashed but will also not go away so the rebase will fail. VS buttons to continue or abort will also fail. In CLI, it is functioning as normal so this is primarily a VS-ish bug. The bug is probably also on git side where the folder is not removed when either the rebase fails or when aborted.
No comments:
Post a Comment