Article Directory
1. Commonly used commands
1. Code regular preservation
- The programmer’s development habit is that after typing a piece of code that he thinks, he likes to save it with Ctrl+S. I
personally suggest that代码之前做好代码差异比对，检查好提交文件的状
if the code is modified and saved, you can withdraw it if you don’t want to keep git restore'file name'.
View the file statusgit status
2. git stash temporary save
Note: Execute before git add
and encounter other requirements during the code development process. If the code developed at this stage is not rolled back, you can save the code temporarily
- git stash save'temporary comment information' —> will show your temporary location stash@{0} 0 is the start of the index
- git stash list ------>View the list of temporary areas
- git stash pop stash@{num} ------>Restore work progress to the workspace {restore the most recent time by default}
- git stash apply stash@{num}------>Restore the work progress to the work area and the work progress can be restored repeatedly
- git stash drop stash@{num}------>Delete the saved work progress {restore the most recent one by default}
- git stash clear -------->Delete all saved work progress.
3. git add
- git add. -----> will add all local untrack files to the temporary storage area, and filter according to .gitignore
- git add * -----> will add all local untrack files to the temporary storage area, and will not filter based on .gitignore
- git add -A -----> commit all changes
- git add -u ----->Submit modified and deleted files, excluding new files (new)
If you don’t want to keep git restore --staged'file name after the code is placed in the staging area 'To withdraw
4. git commit
- git commit -m "Remarks" ------>Submit the staging area to the local warehouse
- git commit -a "Remarks" ------>Submit the staging area to the local warehouse, no need to execute the git add command
修改注释 - git commit --amend ----->modify the last comment --> i edit --> Esc to exit --> :wq save and exit
rebase -i HEAD~2---->You can modify which comment you want The pick in front of the comment is replaced with edit. The method is the editing method mentioned above: i—Edit, replace pick with edit—Esc—:wq.—>git commit --amend—>git rebase --continue
If the code is placed in the warehouse, you don't want to keep
$ git restore- s HEAD~1 xxx // This naming means to roll back the version to the previous version of the current snapshot
$ git restore -s 91410eb9 xxx // Change the command to specify a clear commit id and roll back to the specified snapshot
$ git reset - soft HEAD^ // This command means to revoke commit to the last commit version
5. git push
- git push <remote host name> <local branch name>:<remote branch name>
- The local and remote branch names are the same git push <remote host name> <local branch name>
- git push origin --delete xxx delete remote branch name
- git push --set-upstream origin xxx-----create the corresponding remote warehouse
6. git pull
- git pull origin master:brantest----> pull the remote master branch to merge the local bratest branch.
- If the remote branch is merged with the current branch—>git pull origin master
Two, branch management
1. Create a new branch
- git branch xxx New branch
- git checkout -b xxx Create and jump
2. Switch branches
- git checkout xxx switch a branch
3. View branches
- git branch lists all local branches
- git branch -a lists all remote branches
4. Merging branches
- git merge branch name
3. Resolve conflicts
- Avoid soft conflict
- Update local code git pull before daily development
- Before submitting the code add -->commit-->git pull origin develop:develop-->git push
- Resolve hard conflicts
- If there is a conflict, analyze whether the conflict area is your own or another developer's code, and if it is another person's code, you need to communicate and resolve it.
- Own local code conflict, confirm that the reserved part of the code accepts the current change (Accept Current Change) accepts the incoming change (Accept Incoming Change)
- Then add the code to git add. —> git commit -m "Remarks" —> Submit git push
- When the frequency of development is high, try to keep your local code consistent with the version code, reduce differences, and avoid conflicts