I have seen a few of these posts around but all involve running git commands. So since I do not run git commands I apologize if this is simpler than I think. We are using Microsoft visual studio team foundation service

I have an issue with a branch that I merged inside visual studio. I am running VS 2019.

1. I cannot switch from the Detached branch as you can see this image here:
2. I cannot do anything to move the branch forward. Everything is grayed out:
3. I cannot use master branch to create a new branch and switch to it.

Initially I had a warning in git: :"unable to pull because your local and remote branches changed. set your preferred git behavior for how to reconcile diverged branches in git settings."

So I ended up going to Toolbar | Git | Settings I changed the following setting:

Please help! Thanks!

Here is my git status response... Please let me know how to proceed :(

CodePudding user response：

I ended up bailing on the whole rebase. I simply cut the folder and put it in a different location. Then I pulled back in the code from my team foundation service.

then I merged in the differences by just pulling in the files I knew I updated. Very annoying but I could not figure it out otherwise!