IDEA plug-in integrated gitee

My version 2018.3.4 IDEA, IDEA different versions of operation is almost the same, please refer to start using Gitee plug it below!

 

IDEA Version

Gitee plug-in installation

[File] - [Settings] - [Plugins], and install the plug-in to view gitee

 

Gitee plug-in installation

After installation is complete, restart IDEA

 

Restart IDEA

Add Gitee Account

[File] - [Settings] - [Version Control] - [Gitee], click [Add account] Add Account

 

Add Gitee Account

Enter the account number and password, click [Log In]

 

Enter the account number and password

Account information will be displayed after a successful login

 

Gitee successful login

Project Initialization

IDEA Project Share Gitee

Select the items you want to synchronize, click on the menu [VCS] - [Import into Version Control] - [Share Project on Gitee]

 

Share Gitee

Click on the button [Share]

 

Use the default name warehouse

The removal of unnecessary files check mark, click [Add]

 

submit

Tip success of the project to share Gitee

 

Sharing success

Login Gitee can see the project

 

Gitee view shared results

Gitee project to clone IDEA

【VCS】-【Checkout from Version Control】-【Git】

 

Cloning Gitee items

Enter Gitee project URL, click [Clone], start cloning

 

Enter the URL Gitee project

Click [Yes]

 

confirm

Click [This Window]

 

Select the new project container

Successful cloning, you can see the project code

 

After the successful cloning View Code

Gitee teamwork

Pulling Code

【VCS】-【Update Project】

 

Pull menu

Click [OK]

 

confirm

Tips how many files are updated, you can click [View] to view the updated list of files

 

Prompted to update the number of files

Update the file list

 

Update the file list

Submit code

Note: Submit the code before, you should pull. Code conflicts if pulled, should resolve the conflict before submitting

【VCS】-【Commit】

 

Submit menu

Choose what code submitted, the default Select, enter commit message, click [Commit and Push]. First Commit or click [], then click from the menu [Push]

 

Submit to Gitee

Select the default branch, click [Push]

 

Select branch

Submitted successfully

 

Submitted successfully

Code Violation

When submitting or pull the code, conflict will pop up the following dialog box, select the file conflict, click [Merge]

 

Conflict file list

Three dialog boxes appear, are:

• Code is left to be submitted to the local border

• The right side of the box is Gitee code

• The middle frame is the result of resolving conflicts codes

Code to resolve the conflict: We modified intermediate code, select [Accept Left] or [Accept Right] under the circumstances; or also manually click on conflict revised Code [Apply]

 

Resolve conflicts

Click [Yes]

 

confirm

When all files to resolve conflict, they can resubmit

References:

IDEA tutorial Gitee plug-ins (code cloud)