Go Eclipse SVN conflict resolution

Original address: http://www.devnote.cn/article/82.html

The basic principle is: before each commit need to compare with the line, first resolve the conflict, and then the online update to local, and finally the local submission up.

1. Right-click Project, Team, and resource library synchronization
   
2. Select Conflicts Mode in the Sync view to first view resolve conflicts
   
3. Double-click the conflicting file you want to resolve, this is Student.java, and the comparison view appears in the main display area on the right. Local program on the left and the latest code on SVN on the right
   
   The original field name is e-mail, the local change it to EmailAddress, the online code shows that someone has changed the original email to PhoneNumber and added the properties teacher
4. Select the two lines on the right, click the icon to copy to local, save
   
   Now that the code on the line has been taken down, you can proceed to the next step.
5. Right-click the conflicting file and select "Mark as merged"
   
6. Click Update (other conflict-free code on the update line), incoming Mode, right item
   
7. Click Submit with outgoing Mode-right item. Enter a comment to determine the submission.
   Experience: It's a good idea to double-click on the audit side of the list (all the modified) files in the view before committing, making sure there are no errors or temporary code. This step often checks for problems.
   

Go Eclipse SVN conflict resolution