1. 对当前dev分支的本地代码进行储存
1.1 如当前代码未编辑完,不想提交,即可将当前dev分支的代码暂存
git stash save '暂存描述'
1.2 如当前代码已编辑完,即可将当前代码提交到本地仓库
git add .
git commit -m '提交描述'
2. 切换到master分支 将master最新代码,拉取到本地
// 切到master
git checkout master
// 拉取master远程代码
git pull origin master
3. 切换到dev分支,并将master最新代码合并至dev分支上
// 切换到feature分支
git checkout dev
// 将master最新代码合并至dev分支
git merge master
4. 将dev分支代码提交至远程仓库(如没有提交的代码,此步骤跳过)
// 将文件提交到dev远程仓库
git push -u origin dev
5. dev分支合并到master分支
// 切到master
git checkout master
// dev分支的代码合并到master分支
git merge dev
// 查看状态
git status
// 提交远程
git push origin master
6. 暂存当前分支的修改,切换至dev分支,将暂存区文件回滚
// 暂存修改
git stash
// 切到dev branch
git checkout dev_branch
// 回滚第一个暂存区
git stash pop
7. 远程已有分支,本地新建分支并关联
git fetch
git checkout -b local_branch origin/remote_branch
8. 重命名分支
git branch -m old_branch_name new_branch_name
9. fix: Please commit your changes or stash them before you switch branches.
// hide changes
git stash
// recover changes
git stash pop
10. Delete branch
// delete local branch
git branch -D + branch-name
// delete remote branch
git push origin --delete branch-name
11. New branch
git branch branch-name
git checkout branch-name
git add .
git commit -m “commit message”
git push -u origin branch-name
12. query branch
git branch -a
// query remote branch
git branch -r
// query local branch
git branch