Intellij IDEA Tutorial (eight) Gitee use

I. Introduction

Gitee Manual

Cloud code (Gitee.com) is designed for developers to provide a stable, efficient and secure cloud platform software development collaboration.
Whether individuals, teams or companies, are able to achieve code hosting, project management with the code cloud, collaborative development.

Cloud code officially launched in 2013, developed by the open source based Gitlab China, we have done a lot of improvements and custom development on the basis of Gitlab, dedicated to domestic developers to provide quality and stable hosting services. It has now become the largest code hosting system.

• Compared GitHub, Gitee domestic service, fast access speed
• Personal totally free, more in line with people operating habits
• Active open source community

II. Installation Gitee

Click Settings - Plugins search gitee, then install, the installation is complete after the restart idea

III. Configuration Gitee Account

Click Settings - version control - Gitee, then click the Add account, add the account

input Gitee user name and password, if not go Gitee registered account

will have the account information after registration is completed

IV. Gitee landing new projects

First landing Gitee, create a new project, click on the top right of the plus sign, the new warehouse

entering information, click Create

created.

V. new construction submitted to Gitee

Then open the idea, click on the top menu VCS as shown below, select Import into Version Control, choose Share Project on Gitee

then pop-up dialog box, click Share

and select the file you want to upload, click Add

after submitting a successful completion of the lower right corner of information box appears

Login Gitee can just see the project submitted

VI. From the project to the local clone Gitee

Operation as shown

URL input Gitee project, click Clone, start cloning

click Yes

in the current window or open a new window can

then see cloned into local projects

VII. Pull Code

Click VCS-- Update Project

Click OK

bottom right corner of the message box appears, as shown below, indicating a successful update file

VIII. Submit code

Develop good habits, be sure to update before committing to avoid unnecessary conflicts
when submitting the code of points 2, added to the display buffer, and then commit, Git - Add,

then choose Git - Commit File

which files are selected required to submit, submit input information, click commit and Push

here default branch, and then click Push

the bottom right to submit information box success

IX. To resolve conflicts

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

Below, three dialog box appears, namely:

• 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, you can choose Accept Left or Accept Right under the circumstances; also in post-conflict or manually modify the code click Apply, the purpose of the code is to look left, right and which one is required to submit a final, usually merged into the middle of the middle and then submit content.

Click Yes, merge successfully.