If you are using Visual Studio 2015’s integration with Visual Studio Team Foundation Server, VSTFS for short. You might have run across this issue when using GIT as your repository. We love using GIT over Microsoft’s TFS repository. I have heard from people within the company that their developers prefer GIT and they are doing away with their own TFS. Something to keep in mind.
This issue comes up after you do a fetch and pull or sync;
“Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details.”
Steps
- Go to the directory where your project is and right click on the folder
- Type ‘git status’
- this gives you an idea what files are blocking your pull
- Now uncommit the changes or stash them
- Type got pull
- Reload your project and you are back in business
Git is a pile of crap. Anyone saying differently is lying. I’d rather use SourceSafe at this point. At least it worked as expected.
Git always works as expected. You do have to know what to expect, though…
It is full of bugs, it has community because is it free, it is not use friendly, and has the terminology of the 70’s Unix developers
Not everything for free we should like
I wasted hours with this Sh***ty source control
In 12 years of use, I’ve never run into a bug in Git; what bugs have you found? Some parts of the UX could probably be improved, but suboptimal UX isn’t a bug.