p25 分支操作
Administrator@F4HFJA67XY3IIM1 MINGW64 /c/gitExercise/weChat (master)
$ git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: apple.txt
no changes added to commit (use "git add" and/or "git commit -a")
Administrator@F4HFJA67XY3IIM1 MINGW64 /c/gitExercise/weChat (master)
$ git branch -v
* master 1eaf8cc apple first version
Administrator@F4HFJA67XY3IIM1 MINGW64 /c/gitExercise/weChat (master)
$ git branch hot_fix
Administrator@F4HFJA67XY3IIM1 MINGW64 /c/gitExercise/weChat (master)
$ git checkout hot_fix
Switched to branch 'hot_fix'
M apple.txt
Administrator@F4HFJA67XY3IIM1 MINGW64 /c/gitExercise/weChat (hot_fix)
$ git branch -v
* hot_fix 1eaf8cc apple first version
master 1eaf8cc apple first version
Administrator@F4HFJA67XY3IIM1 MINGW64 /c/gitExercise/weChat (hot_fix)
$
p26 解决合并分支后产生的冲突
p27 Hash算法简介