From 75b67e4cf7fa202073df0af0d8983e3795cd9f9b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Jun 2025 14:34:58 -0500 Subject: [PATCH 1/6] CHange --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 22e66de..fd11bf8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # github-reu -Welcome to the GitHub training!! +Welcome to the GitHub training! + +CHANGED From 139ea0ab1ec02240e4fc39ddce7ca80aab3b1b64 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Jun 2025 14:45:26 -0500 Subject: [PATCH 2/6] hello --- 'new_file'.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 'new_file'.txt diff --git a/'new_file'.txt b/'new_file'.txt new file mode 100644 index 0000000..1620206 --- /dev/null +++ b/'new_file'.txt @@ -0,0 +1 @@ +new file create to test From a849ed5d8715cc7b835b43075f1e5e11abfaf861 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Jun 2025 14:48:01 -0500 Subject: [PATCH 3/6] two changes --- file1.txt | 1 + file2.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 file1.txt create mode 100644 file2.txt diff --git a/file1.txt b/file1.txt new file mode 100644 index 0000000..e212970 --- /dev/null +++ b/file1.txt @@ -0,0 +1 @@ +file1 diff --git a/file2.txt b/file2.txt new file mode 100644 index 0000000..6c493ff --- /dev/null +++ b/file2.txt @@ -0,0 +1 @@ +file2 From b8c8297292a6e2b2f59a1950098813ff3d81c2bd Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Jun 2025 14:50:15 -0500 Subject: [PATCH 4/6] creating conflict --- file1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file1.txt b/file1.txt index e212970..6c493ff 100644 --- a/file1.txt +++ b/file1.txt @@ -1 +1 @@ -file1 +file2 From 57b819b5a3557a3994579928b45506c76040736a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Jun 2025 14:56:53 -0500 Subject: [PATCH 5/6] branch2 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fd11bf8..20b6ce8 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,5 @@ Welcome to the GitHub training! CHANGED + +branch2 \ No newline at end of file From 3a1bc6e6193c6ee6a03ad70b4d0943c11d79e185 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 25 Jun 2025 15:17:39 -0500 Subject: [PATCH 6/6] test_conflict --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 20b6ce8..09e4c8e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,13 @@ # github-reu +hello +hello +conflict + Welcome to the GitHub training! CHANGED -branch2 \ No newline at end of file +branch3 +a +asdfsadf \ No newline at end of file