1. Introduction

One of the best things about JetBrains’ IDE is that it’s right out of the box, and almost everything you need to develop is built into the IDE, literally: just a browser. (This will happen in 2021.) .

2. Know the interface

If your current project uses Git version control, you’ll see the following screen.

None of this is visible without Git version control, and you’ll need to reboot to see the menus once you’ve added your Git repository.

If you are not familiar with Git, you can see the {% post_link project or file management wizard -Git %}.

Click √ in the upper right corner to see the following interface.

Git add XXX and Git commit are the two most commonly used Windows. Leave the others as default.

We usually select all the files, enter the commit information, and click Commit.

A dialog box may pop up, which means that there are some errors or irregularities in the file you intend to submit. Review means to view, and Commit means to Commit. I usually click Commit.

After clicking Commit, you can view them in the lower left corner:

This completes a commit, but of course WebStorm version control is much more than that.

3. Roll back the version

If you want to go back to the previous version, right-click the version you want to go back to on the previous page.

A dialog will pop up:

  • Soft: Change the HEAD. Reset HEAD to a commit and place the intermediate commit records in Index.

  • Mixed (default) : Change HEAD and Index. It resets the HEAD to a COMMIT and returns the intermediate commit records and Staging area files to Working copy state.

  • Hard: resets the HEAD and Index and working copy to a commit. The intermediate commit change records, Staging area change files and Working copy change files will all be lost and updated to the commit state. Destructive. If you delete it, get reflog to find out.

4. Create a branch

In the lower right corner, click Master and select New Branch from the dialog box that pops up.

Enter the name of the branch you want to create in the dialog box that pops up.

If you want to switch branches, select a branch and click Checkout.

5. Merge branches

The first thing to notice is that the branch shown in the lower right corner is the merged branch, and the branch chosen to merge is the merged branch.

You can see that test is the merged branch. Click Merge into Current to Merge.

5.1 Conflict Resolution

Code conflicts occur when multiple people collaborate, when branches are merged, or when code is pulled from a remote repository.

In general, manual merging is selected.

Once the merge is complete, click Apply in the lower right corner.

6. The final

Compared to $149 / year and $14.90 / month for Java’s IntelliJ IDEA personal edition, WebStorm’s prices are low enough to make Java developers envious. WebStorm personal edition costs only $59 / year and $5.90 / month, and only $47 for the second year. It’s only 35 dollars in the third year. You can’t buy it, you can’t buy it!