i building dataaccesslayer using c# in vs 2012, , in project, there 3 files don't know how deal with.
dataaccesslayer.csproj.mine dataaccesslayer.csproj.r60 dataaccesslayer.csproj.r72
what they? how should deal them?
they files created repository code saved in. did update , when try commit files commit failed
probably. when diff
files, use .mine .r60 .r72
files bring differences between each revision (.r60, r72) , file (.mine) , allow keep changes in mine
.
in order rid of commit failed
error messages, find original file, update correct changes, , when finished right click , mark resolved
, commit
. rid of files.
Comments
Post a Comment