Git学习笔记（五）

Bug分支

一个有趣的小实验

$ mkdir afeng

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop
$ cd afeng

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng
$ git init
Initialized empty Git repository in C:/Users/赵亚峰/Desktop/afeng/.git/

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ vi test.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git add test.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git commit -m "first test"
[master (root-commit) 98d217c] first test
 1 file changed, 3 insertions(+)
 create mode 100644 test.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git checkout -b dev
Switched to a new branch 'dev'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ vi test.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git status
On branch dev
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   test.txt

no changes added to commit (use "git add" and/or "git commit -a")

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git stash
No local changes to save

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git status
On branch dev
nothing to commit, working tree clean

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git checkout master
Switched to branch 'master'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git checkout -b issue-101
Switched to a new branch 'issue-101'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (issue-101)
$ vi test.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (issue-101)
$ git add test.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (issue-101)
$ git commit -m "fix bug 101"
[issue-101 43a9dd0] fix bug 101
 1 file changed, 1 insertion(+), 1 deletion(-)

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (issue-101)
$ git checkout master
Switched to branch 'master'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git merge --no-ff -m "merged bug fix 101" issue-101
Merge made by the 'recursive' strategy.
 test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git branch -d issue-101
Deleted branch issue-101 (was 43a9dd0).

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git checkout dev
Switched to branch 'dev'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git status
On branch dev
nothing to commit, working tree clean

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git stash list
stash@{0}: WIP on dev: 98d217c first test

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git stash pop
On branch dev
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   test.txt

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (cf8d5889817ff7f5ebcacf7ad86799eda0959e68)

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git stash list

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ cat test.txt
Git is a distributed system
Git is free software
Git trace changes

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git add test.txt

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git commit -m "work out on dev"
[dev bc0b413] work out on dev
 1 file changed, 1 insertion(+), 1 deletion(-)

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (dev)
$ git checkout master
Switched to branch 'master'

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ cat test.txt
Git is a distributed system
Git is a free software

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master)
$ git merge --no-f -m "merge dev to master" dev
Auto-merging test.txt
CONFLICT (content): Merge conflict in test.txt
Automatic merge failed; fix conflicts and then commit the result.

赵亚峰@DESKTOP-0JOAFKG MINGW64 ~/Desktop/afeng (master|MERGING)
$ cat test.txt
Git is a distributed system
<<<<<<< HEAD
Git is a free software

=======
Git is free software
Git trace changes
>>>>>>> dev

本实验用到的新命令
git stash 用于把当前工作现场“储藏”起来，等以后恢复现场后继续工作。

git stash list: 用于查看工作区内容的存贮位置。

恢复git stash命令储藏的文件
一是用git stash apply恢复，但是恢复后，stash内容并不删除，你需要用git stash drop来删除。
另一种方式是用git stash pop，恢复的同时把stash内容也删了。

Feature分支

用于开发新功能，在dev分支之下。
如果要舍弃一个还没有被合并过的分支，可以用git branch -D name强行删除。