Integration and synchronization of SVN in Eclipse:

Integration and synchronization of SVN in Eclipse:

1. Pull from trunk to branch:

Then the next step, until the completion is OK.

2. Merge from Branch code to trunk:

2.1, the local need to submit the updated code to submit updates to the SVN branch

2.2. Switch the local path to the trunk where the code needs to be merged:

Then you need to keep the local existing code and trunk exactly the same (otherwise SVN won't allow merging)

2.3, the merger:

Now we need to merge the code from the branch into the trunk, so we choose the second one (usually we only use the first one-from the trunk to the branch and the second).

After clicking OK, a list of statistics differences will appear, such as:

Click OK, it will merge the code you need to merge into your local, then you need to resolve the conflict locally, and then submit the local code.

3. Synchronize the trunk code to the branch:

3.1: Switch The local path to the branch (as described in 2)

3.2: Then select Merge, select the first option from the first (as in the 2.3 operation), and then the next one

3.3: Other operation is the same as the large diameter of 2, do not narrate here

always remember that where you want to merge the code, switch to the current directory. It's also important that when merging operations, local code is consistent with the branch to be manipulated( like updates and commits must be done before merging ), and must have a branch (or code that is consistent with the trunk) to be merged

Integration and synchronization of SVN in Eclipse: