Git use record notes

First, the commonly used git command

Version rollback git reset

Method one git reset --hard 1094a(commit id number)
 Method 2 git reset --hard HEAD^(The previous version is HEAD^, the previous version is HEAD^^)

View branch/switch branch git branch / git checkout branch name
Undo changes git checkout - filename

git checkout -- readme.txt

Note:--Very important, no--, it becomes the command to "switch to another branch"

Delete Files git rm

Usually when we add files, we usegit add But if we delete the file from the workspace, we need to use it.git rmDelete the files in the staging area to usegit commitsubmit
Create branch

Git checkout -b dev (create and switch to the dev branch)
 Git branch -d feature1 (delete the feature1 branch)
 == The following two steps
 Git branch dev (git branch is to view the branch git branch dev create a dev branch)
 Git checkout dev (switch to dev branch)

Merge branch

git merge dev

Used to merge the specified branch to the current branch (this is more important). For example, you want to merge the dev branch intomasterOn the branch, you need to switch tomasterBranch then executegit merge dev

Conflict resolution

When you merge branches, you will find that the branch and the branch to be merged have the same modification.

In this case, we need to open the conflicting file, edit the final version, and then executegit addwith git commit submit.

Second, the common problem solving

Some auto-generated files appear, and modifying .gitignore doesn't work. For example, the .idea file in the Android studio project

git rm -rf --cached .idea

Intelligent Recommendation

Record Git use

Record Git use First, pull the existing project (vscode) In vscode, first initialize GIT Pull the project Second, create a branch Third, check the files under the current branch and the unloaded file ...

Git use record one

Gitbash dropped gitee branch Order Git Clone HTTPS Address git branch -a git checkout -b feature#I2M7ZY origin/feature#I2M7ZY Git Pull (generally not) Order Git Clone HTTPS Address // Clone warehouse ...

Git use process record

Download code Enter the code catalog Practical comparison tool comparison difference View status Add all files in the current directory to the temporary storage area: View status After adding to the b...

Git command use record

The blog is continuously updated. If there is something wrong or need to be perfected, please point out! vim: The commands that enter the VIM mode later will be replaced by VIM; The VIM editing mode i...

[Use in git, problem record]

1. GIT usage scenario: The author of the warehouse needs to recite to merge the branch hint"Pull request authors cant approve"That is to say, the submitters cannot review myself, but the cur...