Solution to conflicts when svn submits files

1. mine: changed by myself, r1604: written by others
2. Right click--Edit conflicts, edit conflicts, according to the two different versions on the left and right, a final version is synthesized
3. Resolved, the conflict is resolved
4. The yellow warning is gone, changed Going back to the familiar modified mark~~ Now you can commit normally.



Reference : http://www.cnblogs.com/kenkofox/archive/2010/10/17/1853785.html