文章目录
基础操作实例
# git branch 查看当前分支 主分支master
* master
# git branch dev 创建dev分支
# git branch
dev
* master
# git checkout dev 切换到dev分支
Switched to branch 'dev'
# git branch
* dev
master
# rm -f 44.txt 删除文件操作
# git add --all 提交所有修改过的文件到暂存区
# git commit -m "删除 44.txt" 提交到本地 dev版本库
[dev e793b1d] 删除 44.txt
1 file changed, 1 deletion(-)
delete mode 100644 44.txt
# git checkout master 切换到master主版本库
Switched to branch 'master'
Your branch and 'origin/master' have diverged,
and have 15 and 7 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
# ls 查看当前目录有44.txt
44.txt 55.txt 66.txt 77.txt 88.txt aa.txt bb.txt cc.txt dd.txt ee.txt README.md readme.txt
# git merge dev 合并dev分支到master主版本库
Updating f1b1889..e793b1d
Fast-forward
44.txt | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 44.txt
# ls 再查看当前目录44.txt删除
55.txt 66.txt 77.txt 88.txt aa.txt bb.txt cc.txt dd.txt ee.txt README.md readme.txt
实操几遍