Unable to merge branch in in-house TFS GIT from Visual Studio 2013
问题 I've looked around SO and either can't find an answer close to my question or don't fully understand the answers being explained. I am having an issue trying to merge a development branch into the master branch (both origin branches) I receive the error 2 uncommitted changes would be overwritten by merge I have switched branches in an attempt to commit these 2 changes, though don't have any. There are no changes to commit on my master. I wasn't sure if it was perhaps related to a developer