IDE using the GIT version control project

IDEA itself inherited GIT develop plug-ins. Only you need to install windows git client can use.

check in project check-in project

The newly created project uploaded to the server.

For git , the empty directory will not be uploaded to a remote repository. So, you want to upload new projects, the need to provide at least one file in each directory necessary. Otherwise, others detected ( the Check OUT ) project, it is an empty project.

Steps:

 

 

 

 

 

 

 

 

 

 

 

 

 

 

 

 

 

 

 

Solution:

Directory in the local repository  -> Right > - -> GIT Base Here inputted sequentially following . 3 commands

git pull

git pull origin master

git pull origin master --allow-unrelated-histories

 

 

 

Push again.  

 

 

 

 

 

 

 

 

Detection project

 

 

 

 

 

 

 

submit

The modified content, saved to a local warehouse.

Including new content and modify content, delete content.

 

 

 

 

 

 

 

 

 

 

 

update content

 

 

 

 

 

 

 

 

 Remove content

 

 

 

 

 

 

 

Push

The latest contents of the local repository, push the remote repository. When pushed, all editions include local repository migration information.

 

 

 

 

 

 

 

Commit and push

Simplify the write process. The combined operation will be submitted to the local warehouse and push remote repository.

 

 

 

 

 

 

 

 

 

 

 

 

 

Read

Pull

The remote is the new content repository, downloaded to the local.

 

 

 

 

 

Conflict Resolution

 

When a content versioning conflicts, how to deal with.

 

After the push client will be prompted, version conflicts, the proposed merger of ( Merge ).

 

 

 

 

 

 

 

 

Branching process

Find new local branch of a remote repository:

 

 

 

 

 

 

Guess you like

Origin www.cnblogs.com/sakura-yxf/p/12163627.html