From ad56a74334573fc596dd5a1af1eaf861ca471c50 Mon Sep 17 00:00:00 2001
From: nk <517923831@qq.com>
Date: Wed, 16 Oct 2019 10:35:06 +0800
Subject: [PATCH 1/6] github test

---
 README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1f59f99
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+github命令测试
\ No newline at end of file

From 1950b5b70158959d166858f88a1b1a5eb7f3a49e Mon Sep 17 00:00:00 2001
From: nk <517923831@qq.com>
Date: Wed, 16 Oct 2019 11:04:19 +0800
Subject: [PATCH 2/6] github test2

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1f59f99..7aa636d 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
-github命令测试
\ No newline at end of file
+github命令测试
+tickets
\ No newline at end of file

From 980cd35cf439920e7d0ed2a020e91d365a35f1dd Mon Sep 17 00:00:00 2001
From: nk <517923831@qq.com>
Date: Thu, 17 Oct 2019 10:07:30 +0800
Subject: [PATCH 3/6] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7aa636d..35980d9 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 github命令测试
-tickets
\ No newline at end of file
+tickets
+pull

From 5936d25acea2b342addfde832a238c98f89f6403 Mon Sep 17 00:00:00 2001
From: nk <517923831@qq.com>
Date: Thu, 17 Oct 2019 10:14:41 +0800
Subject: [PATCH 4/6] A branch test

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 35980d9..5fefd8c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
 github命令测试
 tickets
 pull
+A分支内容

From cf6dd165897080031b819ab69975d72a51cf7a59 Mon Sep 17 00:00:00 2001
From: nk <517923831@qq.com>
Date: Thu, 17 Oct 2019 10:21:31 +0800
Subject: [PATCH 5/6] git

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5fefd8c..f58e6c2 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,4 @@ github命令测试
 tickets
 pull
 A分支内容
+合并分支冲突测试
\ No newline at end of file

From c04ae528711a7b441e6c915a3359ce7c410f0574 Mon Sep 17 00:00:00 2001
From: nk <517923831@qq.com>
Date: Thu, 17 Oct 2019 10:24:40 +0800
Subject: [PATCH 6/6] master

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5fefd8c..ffdd0f8 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,4 @@ github命令测试
 tickets
 pull
 A分支内容
+this is master
\ No newline at end of file