Visual Studio Git Changes Stuck In Merge In Progress