问题
I have a visual studio 2008 database project that is under version control (git). I am getting conflicts in the project_name.dat when I try to merge my branches.
So my questions ares:
- What is the project_name.dat file?
- Do I need it? That is can I leave it out of my version control
回答1:
No , you shouldn't have it under sourcecontrol as it's autogenerated.
回答2:
Offtopic but maybe useful:
You should configure your VCS so that special files and folders will be ignored during your commit. I use Subversion in a Windows environment and the only thing to do is to put a file called config in %APPDATA%/subversion.
Inside it look like this:
global-ignores = \bin \obj .suo _ReSharper *.resharper *.user *.ncb \Debug \Release
来源：https://stackoverflow.com/questions/1122151/do-i-need-the-dat-file-when-i-place-a-visual-studio-database-project-under-vers