From 90b989c660f5497016a63a3c4cb6c84f674fae75 Mon Sep 17 00:00:00 2001 From: Ye Hong Date: Sat, 2 Jul 2022 17:27:57 -0700 Subject: [PATCH 1/4] test on changes by YH --- new_text_YH.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 new_text_YH.txt diff --git a/new_text_YH.txt b/new_text_YH.txt new file mode 100644 index 0000000..7c07c68 --- /dev/null +++ b/new_text_YH.txt @@ -0,0 +1 @@ +this is a new text added by YH From 0dde37247452b047757462a0ae813894e62901e9 Mon Sep 17 00:00:00 2001 From: Ye Hong Date: Sat, 2 Jul 2022 17:46:53 -0700 Subject: [PATCH 2/4] test on merge conflict --- new_text_YH.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/new_text_YH.txt b/new_text_YH.txt index 7c07c68..5382cf1 100644 --- a/new_text_YH.txt +++ b/new_text_YH.txt @@ -1 +1,2 @@ this is a new text added by YH +this text is different from the main branch \ No newline at end of file From 7405bf26f7df399ce83b3e9b4ae57016f5ff80de Mon Sep 17 00:00:00 2001 From: Ye Hong Date: Sat, 2 Jul 2022 17:53:05 -0700 Subject: [PATCH 3/4] test2 on merge conflict --- new_text_YH.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/new_text_YH.txt b/new_text_YH.txt index 5382cf1..b342b47 100644 --- a/new_text_YH.txt +++ b/new_text_YH.txt @@ -1,2 +1,3 @@ this is a new text added by YH -this text is different from the main branch \ No newline at end of file +some changes made by YH +this text should be the same as the main branch \ No newline at end of file From 3b5bbb0a9d66586b8523a4fb8ba95f74f6c9d285 Mon Sep 17 00:00:00 2001 From: Ye Hong Date: Sat, 2 Jul 2022 18:12:32 -0700 Subject: [PATCH 4/4] test 3 on merge conflict --- new_text_YH.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/new_text_YH.txt b/new_text_YH.txt index b342b47..f248e95 100644 --- a/new_text_YH.txt +++ b/new_text_YH.txt @@ -1,3 +1,3 @@ this is a new text added by YH -some changes made by YH -this text should be the same as the main branch \ No newline at end of file +some changes made by Mary +this text should be different from the main branch \ No newline at end of file