Geeks With Blogs

News


Josh Tenenbaum Errant ramblings
If you are trying the new Visual Studio 2012 TFS Git source control and are trying to pull from master and get the error that "There are changes in the current working directory."  You should add the ".gitignore" file the following:
".gitattributes" and ".gitignore".

Feb 26, 2013 Update -- Apparently my ignorance caught up with me.  You should not ignore the .gitattributes file, but add it to your repository from within Visual Studio. (Thanks Eric).
Posted on Thursday, February 21, 2013 2:39 PM | Back to top


Comments on this post: TFS GIT pull "changes in the current working directory"

# re: TFS GIT pull "changes in the current working directory"
Requesting Gravatar...
its a wise decision but i don't think that it will work according to the need of the present online market situation. The complexity of the process can cause troubles to the beginners.
Left by Sanjeev on Feb 22, 2013 6:08 AM

# re: TFS GIT pull "changes in the current working directory"
Requesting Gravatar...
Ignore .gitattributes? That's a bad idea... the point of .gitattributes within a project repo is to push a common set of attributes to everybody within that project, like the CRLF setting, and various other project-wide settings.

They should be source controlled, so that you know who changed it, and so that you'll get the new project-wide settings that your team agrees on.

This is bad advice, in my opinion.
Left by Eric Newton on Feb 26, 2013 12:01 PM

Your comment:
 (will show your gravatar)


Copyright © Josh Tenenbaum | Powered by: GeeksWithBlogs.net