From fc485d091325302e55f470d72d28fdf37b103687 Mon Sep 17 00:00:00 2001 From: Dinh Quang Date: Sun, 17 Mar 2019 15:24:59 +0700 Subject: [PATCH 1/5] test local repo --- test07 | 1 + 1 file changed, 1 insertion(+) create mode 100644 test07 diff --git a/test07 b/test07 new file mode 100644 index 0000000..49d8dc5 --- /dev/null +++ b/test07 @@ -0,0 +1 @@ +test07 \ No newline at end of file From a52bba2b45757d883db0fe2a8f5eb2ed7327fbc4 Mon Sep 17 00:00:00 2001 From: Dinh Quang Date: Tue, 19 Mar 2019 11:16:11 +0700 Subject: [PATCH 2/5] new file test08 --- test08 | 1 + 1 file changed, 1 insertion(+) create mode 100644 test08 diff --git a/test08 b/test08 new file mode 100644 index 0000000..1db9f1b --- /dev/null +++ b/test08 @@ -0,0 +1 @@ +file test08 From 947770ec5b004dba729660cd359fbffdec8677e6 Mon Sep 17 00:00:00 2001 From: Dinh Quang Date: Tue, 19 Mar 2019 11:16:52 +0700 Subject: [PATCH 3/5] new file test9 --- test09 | 1 + 1 file changed, 1 insertion(+) create mode 100644 test09 diff --git a/test09 b/test09 new file mode 100644 index 0000000..b6857ef --- /dev/null +++ b/test09 @@ -0,0 +1 @@ +file test09 From b7238de2212a0d95ea993123efbcd067e65e2116 Mon Sep 17 00:00:00 2001 From: Dinh Quang 02 Date: Sat, 16 Mar 2019 21:36:05 +0700 Subject: [PATCH 4/5] new branch --- test05 | 4 ++-- test10 | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 test10 diff --git a/test05 b/test05 index da3c3c9..9bea203 100644 --- a/test05 +++ b/test05 @@ -1,2 +1,2 @@ -test05 file -more text here \ No newline at end of file + +test05 file after fix conflict diff --git a/test10 b/test10 new file mode 100644 index 0000000..7323ce1 --- /dev/null +++ b/test10 @@ -0,0 +1,2 @@ +test10 +test rebase command From f2d286c3e57c9c9639c24e682713510fc49bb578 Mon Sep 17 00:00:00 2001 From: Dinh Quang 02 Date: Tue, 19 Mar 2019 13:45:08 +0700 Subject: [PATCH 5/5] test rebase command --- test05 | 4 ++++ test11 | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 test11 diff --git a/test05 b/test05 index 9bea203..fc440a6 100644 --- a/test05 +++ b/test05 @@ -1,2 +1,6 @@ + test05 file after fix conflict + +test05 file changed + diff --git a/test11 b/test11 new file mode 100644 index 0000000..496b6d5 --- /dev/null +++ b/test11 @@ -0,0 +1,2 @@ +test11 +