diff --git a/docs/notes/Git.md b/docs/notes/Git.md index dba55f67..5fd34352 100644 --- a/docs/notes/Git.md +++ b/docs/notes/Git.md @@ -60,25 +60,25 @@ Git 的版本库有一个称为 Stage 的暂存区以及最后的 History 版本 使用指针将每个提交连接成一条时间线，HEAD 指针指向当前分支指针。 -

+

新建分支是新建一个指针指向时间线的最后一个节点，并让 HEAD 指针指向新分支，表示新分支成为当前分支。 -

+

每次提交只会让当前分支指针向前移动，而其它分支指针不会移动。 -

+

合并分支也只需要改变指针即可。 -

+

# 冲突 当两个分支都对同一个文件的同一行进行了修改，在分支合并时就会产生冲突。 -

+

Git 会使用 <<<<<<< ，======= ，>>>>>>> 标记出不同分支的内容，只需要把不同分支中冲突部分修改成一样就能解决冲突。 diff --git a/notes/Git.md b/notes/Git.md index dba55f67..5fd34352 100644 --- a/notes/Git.md +++ b/notes/Git.md @@ -60,25 +60,25 @@ Git 的版本库有一个称为 Stage 的暂存区以及最后的 History 版本 使用指针将每个提交连接成一条时间线，HEAD 指针指向当前分支指针。 -

+

新建分支是新建一个指针指向时间线的最后一个节点，并让 HEAD 指针指向新分支，表示新分支成为当前分支。 -

+

每次提交只会让当前分支指针向前移动，而其它分支指针不会移动。 -

+

合并分支也只需要改变指针即可。 -

+

# 冲突 当两个分支都对同一个文件的同一行进行了修改，在分支合并时就会产生冲突。 -

+

Git 会使用 <<<<<<< ，======= ，>>>>>>> 标记出不同分支的内容，只需要把不同分支中冲突部分修改成一样就能解决冲突。 diff --git a/notes/pics/image-20191208201230411.png b/notes/pics/image-20191208201230411.png new file mode 100644 index 00000000..f1d9a936 Binary files /dev/null and b/notes/pics/image-20191208201230411.png differ diff --git a/notes/pics/image-20191208201554687.png b/notes/pics/image-20191208201554687.png new file mode 100644 index 00000000..fb1c03e9 Binary files /dev/null and b/notes/pics/image-20191208201554687.png differ diff --git a/notes/pics/image-20191208201611499.png b/notes/pics/image-20191208201611499.png new file mode 100644 index 00000000..2443caa8 Binary files /dev/null and b/notes/pics/image-20191208201611499.png differ diff --git a/notes/pics/image-20191208201718073.png b/notes/pics/image-20191208201718073.png new file mode 100644 index 00000000..8f6444f9 Binary files /dev/null and b/notes/pics/image-20191208201718073.png differ diff --git a/notes/pics/image-20191208201812357.png b/notes/pics/image-20191208201812357.png new file mode 100644 index 00000000..f16da575 Binary files /dev/null and b/notes/pics/image-20191208201812357.png differ diff --git a/notes/pics/image-20191208202110976.png b/notes/pics/image-20191208202110976.png new file mode 100644 index 00000000..1af266d5 Binary files /dev/null and b/notes/pics/image-20191208202110976.png differ diff --git a/notes/pics/image-20191208202151457.png b/notes/pics/image-20191208202151457.png new file mode 100644 index 00000000..c31e956c Binary files /dev/null and b/notes/pics/image-20191208202151457.png differ diff --git a/notes/pics/image-20191208202707905.png b/notes/pics/image-20191208202707905.png new file mode 100644 index 00000000..0fa151db Binary files /dev/null and b/notes/pics/image-20191208202707905.png differ diff --git a/notes/pics/image-20191208202753553.png b/notes/pics/image-20191208202753553.png new file mode 100644 index 00000000..332fb562 Binary files /dev/null and b/notes/pics/image-20191208202753553.png differ diff --git a/notes/pics/image-20191208202926584.png b/notes/pics/image-20191208202926584.png new file mode 100644 index 00000000..336eb9f1 Binary files /dev/null and b/notes/pics/image-20191208202926584.png differ diff --git a/notes/pics/image-20191208203010540.png b/notes/pics/image-20191208203010540.png new file mode 100644 index 00000000..55fcd191 Binary files /dev/null and b/notes/pics/image-20191208203010540.png differ diff --git a/notes/pics/image-20191208203034705.png b/notes/pics/image-20191208203034705.png new file mode 100644 index 00000000..d679257f Binary files /dev/null and b/notes/pics/image-20191208203034705.png differ diff --git a/notes/pics/image-20191208203112400.png b/notes/pics/image-20191208203112400.png new file mode 100644 index 00000000..5e35cbd8 Binary files /dev/null and b/notes/pics/image-20191208203112400.png differ diff --git a/notes/pics/image-20191208203142527.png b/notes/pics/image-20191208203142527.png new file mode 100644 index 00000000..fcccd156 Binary files /dev/null and b/notes/pics/image-20191208203142527.png differ diff --git a/notes/pics/image-20191208203219927.png b/notes/pics/image-20191208203219927.png new file mode 100644 index 00000000..7a1cabb9 Binary files /dev/null and b/notes/pics/image-20191208203219927.png differ