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.
我有一个受版本控制(git)的visual studio 2008数据库项目。当我尝试合并我的分支时,我在project_name.dat中遇到冲突。
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
什么是project_name.dat文件?
我需要它吗?那我可以把它从我的版本控制中删除
2 个解决方案
#1
No , you shouldn't have it under sourcecontrol as it's autogenerated.
不,你不应该在sourcecontrol下拥有它,因为它是自动生成的。
#2
Offtopic but maybe useful:
Offtopic但可能有用:
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.
您应该配置VCS,以便在提交期间忽略特殊文件和文件夹。我在Windows环境中使用Subversion,唯一要做的就是在%APPDATA%/ subversion中放置一个名为config的文件。
Inside it look like this:
里面看起来像这样:
global-ignores = \bin \obj .suo _ReSharper *.resharper *.user *.ncb \Debug \Release
global-ignores = \ bin \ obj .suo _ReSharper * .resharper * .user * .ncb \ Debug \ Release
#1
No , you shouldn't have it under sourcecontrol as it's autogenerated.
不,你不应该在sourcecontrol下拥有它,因为它是自动生成的。
#2
Offtopic but maybe useful:
Offtopic但可能有用:
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.
您应该配置VCS,以便在提交期间忽略特殊文件和文件夹。我在Windows环境中使用Subversion,唯一要做的就是在%APPDATA%/ subversion中放置一个名为config的文件。
Inside it look like this:
里面看起来像这样:
global-ignores = \bin \obj .suo _ReSharper *.resharper *.user *.ncb \Debug \Release
global-ignores = \ bin \ obj .suo _ReSharper * .resharper * .user * .ncb \ Debug \ Release