diff --git a/docs/notes/Git.md b/docs/notes/Git.md index 5fd34352..94e3dc3f 100644 --- a/docs/notes/Git.md +++ b/docs/notes/Git.md @@ -5,7 +5,6 @@ * [分支实现](#分支实现) * [冲突](#冲突) * [Fast forward](#fast-forward) -* [分支管理策略](#分支管理策略) * [储藏(Stashing)](#储藏stashing) * [SSH 传输设置](#ssh-传输设置) * [.gitignore 文件](#gitignore-文件) @@ -100,15 +99,7 @@ Creating a new branch is quick AND simple. $ git merge --no-ff -m "merge with no-ff" dev ``` -

- -# 分支管理策略 - -master 分支应该是非常稳定的,只用来发布新版本; - -日常开发在开发分支 dev 上进行。 - -

+

# 储藏(Stashing) diff --git a/notes/Git.md b/notes/Git.md index 5fd34352..94e3dc3f 100644 --- a/notes/Git.md +++ b/notes/Git.md @@ -5,7 +5,6 @@ * [分支实现](#分支实现) * [冲突](#冲突) * [Fast forward](#fast-forward) -* [分支管理策略](#分支管理策略) * [储藏(Stashing)](#储藏stashing) * [SSH 传输设置](#ssh-传输设置) * [.gitignore 文件](#gitignore-文件) @@ -100,15 +99,7 @@ Creating a new branch is quick AND simple. $ git merge --no-ff -m "merge with no-ff" dev ``` -

- -# 分支管理策略 - -master 分支应该是非常稳定的,只用来发布新版本; - -日常开发在开发分支 dev 上进行。 - -

+

# 储藏(Stashing) diff --git a/notes/pics/image-20191208203616628.png b/notes/pics/image-20191208203616628.png new file mode 100644 index 00000000..e4f6d9c7 Binary files /dev/null and b/notes/pics/image-20191208203616628.png differ diff --git a/notes/pics/image-20191208203639712.png b/notes/pics/image-20191208203639712.png new file mode 100644 index 00000000..e5bbd079 Binary files /dev/null and b/notes/pics/image-20191208203639712.png differ