Take a note and record it
1. Merge branch code into the main branch
1. First switch to your own branch (for example, the branch is called: dev)
git checkout dev
2. Pull down the local branch
git pull or git pull origin dev
3. Switch to the master branch
git checkout master
4. Merge the code on the main branch
git merge dev
5. Yesgit statusCheck whether the merge was successful and whether there was a conflict
6. Check that there is no problem, push the code
git push or git push origin master
2. Pull the main branch code to its own branch
1. First check which branch you are in now. If you are in the dev development branch, see if there is the latest code that has not been submitted. If there is, firstgit add . git commit -mCache the code, don't push, and switch to the main branch
git checkout master
2. Pull down the main branch code
git pull or git pull origin master
3. Switch to the development branch dev
git checkout dev
4. Merge the code of the main branch to the development branch
git merge master
5. Yesgit statusCheck whether the merge was successful and whether there was a conflict
6. Check that there is no problem, push the code
git push or git push origin dev
3. Commonly used git operation commands are extended, and you are welcome to leave a message for commonly used operation commands.
1. View all branches
git branch -a
2. Create a new branch and switch to a new branch
git checkout -b test
3. Create an empty branch
1）
git checkout --orphan dev(dev: new branch name)
2）
git rm -rf .
3) // Because the empty branch is invisible, initialize it
touch .gitignoregit add .gitignoregit commit -m 'initialize branch'
4）
git push --set-upstream origin dev
4. Create a new branch from the specified branch
1) Switch to the branch you specified, such as: dev; and pull the latest code
git checkout devgit pull
2) Create a test branch and switch to that branch
git checkout -b test
3) Push the branch to the remote repository
git push origin test
5. Rewind version
Fall back to previous version
git reset –hard HEAD^
Fall back to the previous 2 versions
git reset –hard HEAD~2
Fall back to the specified version, you can first git log to view the version number
git reset --hard version number
6. Eliminate merge records in the same branch (View specific articles)
Change to when git pull
git pull --rebase