From c53f0a6e0434d9f0b20c2e10010ec26d133fa12b Mon Sep 17 00:00:00 2001 From: Tevvx Date: Fri, 5 Jul 2024 19:02:50 +0800 Subject: [PATCH 1/5] First commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ecbe0ba..fb2d969 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # Git & Github Workshop (July 2024) +Step 1: git clone LINK_TO_DEPOSITORY +Step 2: \ No newline at end of file From ae44925fdede39c39d0de9ad63158ecb3fbe611f Mon Sep 17 00:00:00 2001 From: Tevvx Date: Fri, 5 Jul 2024 19:10:53 +0800 Subject: [PATCH 2/5] Second commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb2d969..db22c7c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # Git & Github Workshop (July 2024) Step 1: git clone LINK_TO_DEPOSITORY -Step 2: \ No newline at end of file +Step 2: Open the directory \ No newline at end of file From 5bc163bfe35274328bad58f94d827e76ce2b2698 Mon Sep 17 00:00:00 2001 From: Tevvx Date: Fri, 5 Jul 2024 19:46:24 +0800 Subject: [PATCH 3/5] To do is to commit? --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index db22c7c..17eee5b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # Git & Github Workshop (July 2024) Step 1: git clone LINK_TO_DEPOSITORY -Step 2: Open the directory \ No newline at end of file +Step 2: Open the directory + +Lebron \ No newline at end of file From fc992858a2d07f8fbdfc771aa3bbec3dbf8738e3 Mon Sep 17 00:00:00 2001 From: Tevvx Date: Fri, 5 Jul 2024 19:57:03 +0800 Subject: [PATCH 4/5] create.conflict.md --- conflict.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflict.md diff --git a/conflict.md b/conflict.md new file mode 100644 index 0000000..a49190a --- /dev/null +++ b/conflict.md @@ -0,0 +1 @@ +Yu Xuan sucks \ No newline at end of file From 441f2a130fadf7ce482fa4f6ddd2e05f9ec28be4 Mon Sep 17 00:00:00 2001 From: Tevvx Date: Fri, 5 Jul 2024 20:01:44 +0800 Subject: [PATCH 5/5] conflict.md --- conflict.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict.md b/conflict.md index a49190a..70c379b 100644 --- a/conflict.md +++ b/conflict.md @@ -1 +1 @@ -Yu Xuan sucks \ No newline at end of file +Hello world \ No newline at end of file