Use SVN plugin subclipse in eclipse-Submit, update, resolve conflicts, merge

Reprint Address: http://www.devnote.cn/article/82.html Description: The blog post and related articles on this site are about the actions of Eclipse tested on:Subversion 1.6.19,subclipse 1.8.20, Eclispe Indigo | Windows XP

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. Right-click Project, Team, and Library synchronization
Select Conflicts Mode in the Sync view to First view resolve Conflicts
Double-click the conflicting file you want to resolve, Student.java, and a comparison view appears in the main display area on the right. On the left is the local program, the right is the latest code on SVN

The original field name is e-mail, local change it to EmailAddress, the code shows that someone has changed the original email to PhoneNumber and added the property teacher Select the right side of the two lines , click the icon to copy to local, save

The code on this line has been taken down and you can proceed to the next step. Right-click on the conflicting file, select "Mark as merge"
Tap incoming mode-right item--Update (other conflict-free code on update line)
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.
If this content is helpful to you, welcome to click on the form of ads to support us, but please do not more than once a day, or may be identified malicious click, resulting in the number. Related articles: Use SVN plugin subclipse in Eclipse-merge branches into skeleton eclipse using SVN plugin subclipse-Project checkout eclipse using SVN plugin subclipse-Create branch Use SVN plugin subclipse in eclipse-delete branch eclipse using SVN plugin subclipse-Ignore directory or file eclipse install SVN plugin online subclipse