You see that test.txt is marked as 'M' all thats left to do is commit.Ĭ:\workspace\test2>svn ci -m "conflict resolved" You can now check the status with svn status. Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved, A status of 'G' means there was a conflict and it has been resolved. Now if you use the 'r' it will mark the file is merged with a 'G'. Save your changes and exit your text editor and it will give you the conflict options again. User1 is making a conflict test User2 making conflict You can resolve the conflict here by changing the text to what you desire. 'e' option will open the conflicted file in the text editor that you configured for svn to use. svn/tmp/test.txt.2.tmp Tue Aug 10 11:33:24 -1 1,3 No newline at end of file If you type 'df' it will show you a all the conflicts in the following format (l) launch - launch external tool to resolve conflict (p) postpone - mark the conflict to be resolved later #标记冲突,稍后解决 (tf) theirs-full - accept their version of entire file (same) #完全以服务器为准 ![]() (mf) mine-full - accept my version of entire file (even non-conflicts)#完全以本地为准 (tc) theirs-conflict - accept their version for all conflicts (same) #冲突以服务器为准 (mc) mine-conflict - accept my version for all conflicts (same) #冲突以本地为准 (dc) display-conflict - show all conflicts (ignoring merged version) #显示所有冲突 (r) resolved - accept merged version of file (df) diff-full - show all changes made to merged file #显示更改至目标文件的所有变化 (e) edit - change merged file in an editor #直接进入编辑 If you type 's' here you will get a list of the commands and meaning ![]() Svn detects that theres a conflict here and require you to take some kind of action. (mc) mine-conflict, (tc) theirs-conflict, Select: (p) postpone, (df) diff-full, (e) edit,
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |