contents

First, pull the warehouse code, submit the code

Second, new, switch branch

---

First, pull the warehouse code, submit the code

1, pull the git project.

git clone [email protected]

2, submit the code process

Step1. View the project code which makes modifications

STEP2. Update the modified code; add

STEP3. Writing update log; commit

STEP4. Submit Update to Remote Warehouse;

### step1. View the project code which makes modifications
git status

 ### step2. Update the modified code;
 Git add. #. Represents all modified code
 Git add test.cpp # can also only update some of the modified code

 ### step3. Writing update log;
 git commit -m "update a certain function"

 ### step4. Submit update to the remote warehouse;
 Git Push Origin Master #Master indicates the name of the branch
 Git Push Origin Panda # indicates that the submission is updated to the Panda branch.

3. When submitting the code, it is found that the remote warehouse exists with the local inconsistent code. (Some people have submitted new code before you update)

Git Pull - Rebase Origin Master # step1. Don't pull a different branch of remote rush

 Git Push Origin Master # step2. Re-Push

Second, new, switch branch

1. View all current branch lists (Name Prior * Identification The current pointing branch)

### View Local Branch List
git branch

 ### View Remote Branch List
git branch -a

2, create and switch to the new branch:

git checkout -b chen

 ###Equivalent to: 
git branch chen
git checkout chen

3, submit the code to the new branch:

Git Push Origin XXX #xxx indicates the name of the branch

git push origin panda

4, merge branch:

### step1. Cut back to Master branch
git checkout master

 ### step1. Core Panda branch into MASTER
git merge panda

5, delete branch:

Git branch -d xxx #xxx represents the branch name

Third, pull the remote latest code forced overwriting the local code

git fetch --all && git reset --hard origin/master && git pull

The first is: pull all updates, do not sync;

The second is: the latest version on the local code synchronous line (will overwrite all the local files with the same name on the remote warehouse);

The third is: update again (actually no need, the second step is actually done)

 

Fourth, git jumps to the specified historical version

### step1. Pull the latest code:
git clone xxxxxx.git

 ### step2. Switch to the specified version:
 Git Checkout <commit sha> # here is the designated version of the CommMit number

 

Question:When Git Pull is prompted: You cannot pull it out of the change: you have unmissive changes.

reason:There is a modified content locally, but there is no Git Add.

solve:Step1. Use the contents of the Git Stash to temporarily change;

STEP2. Use git press --Rebase Origin Master pulls remote code;

Step3. Then push the code Git Push Origin Master.