Phpstrom uses svn to create and merge shards into the publishing process

Phpstrom uses svn to create and merge shards into the publishing process

1. Create branch branches

The following dialog box is displayed. <喎?http: www.bkjia.com kf ware vc " target="_blank" class="keylink"> VcD4KPHA + IDxpbWcgc3JjPQ = "http://www.2cto.com/uploadfile/Collfiles/20150122/20150122094246177.png" alt = "\">

Repository location: select the location of the database, that is, the trunk main line address. In copy to, select the branch Address to be created, and click "select library file" after the branch or tag.

Because it is the first time to create a branch, there is no information in the branch locations here. We need to add the branches path.

Click +

Select branches and click OK.

Click OK to select the base url and enter the name of the branch we want to create (here we are free to express our branch version in an image, v1.0 is used here, that is, the first version of the branches branch. Remember to enter the information in the comment, similar to creating the branch from trunk Version 3 to branches v1.0.

Then check out the branches v1.0 code in PHPstorm.

Click to add a svn link address.

Click checkout to check the code of a working copy of branches v1.0 to the local device.

Merge branch to trunk

I modified a file on branches v1.0.

The content of this file is modified at the same location on the trunk to create a conflict. The conflict will be resolved after testing.

Submit the changes respectively.

Update the content before merging to ensure the latest content.

Merge

Under trunk, click vcs-> merge from

There is

Click configure branches to see the following

Here is the branches location I added in creating the branch. Select and click OK.

Click merge from

Select merge from branches, and then select v1.0 in the pop-up window.

Click OK. This dialog box is displayed. The first is merge all, and the second is merge quickly. We use the third select with pre-filter to select incremental merge, that is, only the added

In the pop-up dialog box, you can see the content and version number of the modification.

Select and click merge all

Merge starts. A dialog box is displayed, indicating that a conflict exists. In this case, the conflict must be resolved.

Click merge to display the left and right trees. The left is the trunk Modification part. The final result is the branches modification part, here we need to add branches content, so we click the Add button "<" of branches to remove the trunk Modification "X"

Save and finish

Prompt that the merge is successful. submit our Merge (commit). Do not forget to write the description here, is an important record basis (when we encounter a conflict, chang list will automatically create a temporary chang list of merge from branches)

After merging, remember to delete the changlist.

At this time, if branches v1.0 is useless, we can delete it.

To view the merged records, you can use show history or the following

Release 3 to the official environment

Branch branches has been merged into our trunk. At this time, we may need to release it to the official environment. In phpstrom, it seems that the show log export function is not available (or, I did not find it)

At this time, you can use tortoisesvn. It is very simple. Right-click svn and select show log. Obviously, we merged the changes at the beginning of 6. If there are more versions, press ctrl and click Select.

Select all files except/cookbook/trunk, right-click and select export to a file.

Upload the exported files to the official environment using ftp. Ensure that the file directories are consistent!

Why do we need to record the merged version number?

For example, if we have already merged branches v1.0 to version 6, we will continue development. When we merge it again, we only need the version 6-merged.