代码改变世界

How to resolve code conflicts on SVN

2011-10-27 15:07  Helen Chai  阅读(407)  评论(1)    收藏  举报

I am a new people to do coding work by using SVN for version controlling as a C# programmer. Then, just want to explain how to deal with conflicts in this article for anybody who will be interesting in future:

Environment: VS2010

Source Control: AnkhSVN

Conflict showing sample:

<<<<<<< .mine

  my codes here

=======

  other people's codes

>>>>>>> .r1270

.r1270 means revision number

Resolve solutions:

Resolve Conflict - if there are more than one conflict, some yours is right and some other people's codes is right

Using Working copy flie - no changes here

Using Original file - the file will be revert to the version before revised one by other people

Using My File - ignore other people's changes in the file

Using Their file - ignore any changes coded by myself in the file

Using Mine on conflicts - delete other people's codes whatever how many conflicts in the file

Using Their on conflicts - delete my codes which are conflicts with other people directly whatever how many conflicts in the file also

Notes: it is better update codes to latest version before you do any changes...

Thanks for your time!