From b57eb16ab27f602e03dbc5279291b95838cecbf3 Mon Sep 17 00:00:00 2001 From: Ellen Lee Date: Sun, 23 Jun 2019 16:00:13 +0800 Subject: [PATCH 1/6] feature/a update --- git-demo.html | 1 + 1 file changed, 1 insertion(+) diff --git a/git-demo.html b/git-demo.html index c49420e..98dd00f 100644 --- a/git-demo.html +++ b/git-demo.html @@ -9,6 +9,7 @@

Git Demo

Add something on feature/a

+

Conflict demo - this is feature/a update

\ No newline at end of file From 0beb7621dc5ae276a0aae4ac5103cf01cab47c4f Mon Sep 17 00:00:00 2001 From: Ellen Lee Date: Sun, 23 Jun 2019 16:00:38 +0800 Subject: [PATCH 2/6] master update --- git-demo.html | 1 + 1 file changed, 1 insertion(+) diff --git a/git-demo.html b/git-demo.html index c49420e..8c18650 100644 --- a/git-demo.html +++ b/git-demo.html @@ -9,6 +9,7 @@

Git Demo

Add something on feature/a

+

Conflict demo - this is master update

\ No newline at end of file From 8684a4907b81203674580efbeb12f3fcf000a44f Mon Sep 17 00:00:00 2001 From: ellenlee Date: Sun, 23 Jun 2019 17:34:26 +0800 Subject: [PATCH 3/6] Create README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..edb41ef --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# git-demo +git collaboration demo From a3b8e17ccec250733b29296e84ce82664599c057 Mon Sep 17 00:00:00 2001 From: playcsgo Date: Thu, 8 Jun 2023 11:04:13 +0800 Subject: [PATCH 4/6] add something by fa --- git-demo.html | 1 + 1 file changed, 1 insertion(+) diff --git a/git-demo.html b/git-demo.html index 12eae57..f39c2f9 100644 --- a/git-demo.html +++ b/git-demo.html @@ -4,6 +4,7 @@ Git Demo +

add something by fa

From 1805e38c19814c7ab698076ab32bce597a376711 Mon Sep 17 00:00:00 2001 From: playcsgo Date: Thu, 8 Jun 2023 11:10:33 +0800 Subject: [PATCH 5/6] fa conflict --- git-demo.html | 1 + 1 file changed, 1 insertion(+) diff --git a/git-demo.html b/git-demo.html index f39c2f9..032ed5b 100644 --- a/git-demo.html +++ b/git-demo.html @@ -5,6 +5,7 @@ Git Demo

add something by fa

+

conflic fa

From 935615d32a89d4aecd3ad2c465f18ac97c42a6c0 Mon Sep 17 00:00:00 2001 From: playcsgo Date: Thu, 8 Jun 2023 13:22:53 +0800 Subject: [PATCH 6/6] fa PR --- git-demo.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/git-demo.html b/git-demo.html index 032ed5b..819a078 100644 --- a/git-demo.html +++ b/git-demo.html @@ -6,16 +6,14 @@ Git Demo

add something by fa

conflic fa

+

master update haha

+

edit for PR request

Git Demo

Add something on feature/a

-<<<<<<< HEAD -

Conflict demo - this is master update

-=======

Conflict demo - this is feature/a update

->>>>>>> feature/a - + \ No newline at end of file