From 490d2dbcb9b5d0fd44c936898618e432709c481b Mon Sep 17 00:00:00 2001 From: Billy Hardy Date: Mon, 26 Jul 2021 14:50:17 +0000 Subject: [PATCH 1/8] Add day14 README that will be used by students to generate commits and merge conflicts --- day14/README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 day14/README.md diff --git a/day14/README.md b/day14/README.md new file mode 100644 index 0000000..f6f48d1 --- /dev/null +++ b/day14/README.md @@ -0,0 +1,3 @@ +This is a "readme" file that usually denotes the starting place to get a grasp on the purpose of a project or subfolder. + +We will be making edits to this file as well as creating new ones, in the hopes of demonstrating the power and nuances of git and VCSs. From 9bc115004f2a5293c824792e16a54ff76b44abd4 Mon Sep 17 00:00:00 2001 From: Shirley Zhu Date: Mon, 26 Jul 2021 17:07:51 +0000 Subject: [PATCH 2/8] edit from shirley --- day14/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/day14/README.md b/day14/README.md index f6f48d1..7032a5b 100644 --- a/day14/README.md +++ b/day14/README.md @@ -1,3 +1,5 @@ This is a "readme" file that usually denotes the starting place to get a grasp on the purpose of a project or subfolder. We will be making edits to this file as well as creating new ones, in the hopes of demonstrating the power and nuances of git and VCSs. + +Edit from Shirley \ No newline at end of file From cbb3da4a4c81292118ca9d3c6164366466a765fe Mon Sep 17 00:00:00 2001 From: Meghana Guttikonda Date: Mon, 26 Jul 2021 17:24:25 +0000 Subject: [PATCH 3/8] =?UTF-8?q?=E2=80=9Cchanges=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- day14/README.md | 3 +++ day14/hi.txt | 0 2 files changed, 3 insertions(+) create mode 100644 day14/hi.txt diff --git a/day14/README.md b/day14/README.md index f6f48d1..1583474 100644 --- a/day14/README.md +++ b/day14/README.md @@ -1,3 +1,6 @@ This is a "readme" file that usually denotes the starting place to get a grasp on the purpose of a project or subfolder. We will be making edits to this file as well as creating new ones, in the hopes of demonstrating the power and nuances of git and VCSs. + + +Baguettes are my favorite type of bread. I had one as a snack with olive oil. It was yummy! \ No newline at end of file diff --git a/day14/hi.txt b/day14/hi.txt new file mode 100644 index 0000000..e69de29 From c2a82280495f5049f7db7a23a1c6bcf7478d8169 Mon Sep 17 00:00:00 2001 From: Shirley Zhu Date: Mon, 26 Jul 2021 17:26:59 +0000 Subject: [PATCH 4/8] adding index.html --- day14/index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 day14/index.html diff --git a/day14/index.html b/day14/index.html new file mode 100644 index 0000000..e69de29 From 03595e1eebc7148d0ce6741fb715ed9cc7484eee Mon Sep 17 00:00:00 2001 From: Mahathi Mangipudi Date: Tue, 27 Jul 2021 06:42:11 +0000 Subject: [PATCH 5/8] deleted additional files bc I started late, recreated readme file, day 14 --- day14/README.md | 10 +++------- day14/hi.txt | 0 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 day14/hi.txt diff --git a/day14/README.md b/day14/README.md index 3002fd0..485c29f 100644 --- a/day14/README.md +++ b/day14/README.md @@ -1,7 +1,3 @@ -This is a "readme" file that usually denotes the starting place to get a grasp on the purpose of a project or subfolder. - -We will be making edits to this file as well as creating new ones, in the hopes of demonstrating the power and nuances of git and VCSs. - -Edit from Shirley - -Baguettes are my favorite type of bread. I had one as a snack with olive oil. It was yummy! \ No newline at end of file +Mahathi just created a new file in day14. Testing testing! + +Hi! diff --git a/day14/hi.txt b/day14/hi.txt deleted file mode 100644 index e69de29..0000000 From a79d804e5d9c26f3cd6acb03493e54b960cc1734 Mon Sep 17 00:00:00 2001 From: Mahathi Mangipudi Date: Tue, 27 Jul 2021 07:06:12 +0000 Subject: [PATCH 6/8] creating a conflict --- day14/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/day14/README.md b/day14/README.md index 485c29f..aec4c04 100644 --- a/day14/README.md +++ b/day14/README.md @@ -1,3 +1,4 @@ Mahathi just created a new file in day14. Testing testing! Hi! +I am trying to create a conflict From 8727dde72d4836a309e3a1ff478d26fd918433d3 Mon Sep 17 00:00:00 2001 From: Mahathi Mangipudi Date: Tue, 27 Jul 2021 07:12:39 +0000 Subject: [PATCH 7/8] real conflict --- day14/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/day14/README.md b/day14/README.md index aec4c04..845af5b 100644 --- a/day14/README.md +++ b/day14/README.md @@ -1,4 +1,5 @@ Mahathi just created a new file in day14. Testing testing! Hi! -I am trying to create a conflict +I am trying to create a conflictthis is bad conflict + From 63476460c8a0b966cc1aebcc1c37960bcd2df5d7 Mon Sep 17 00:00:00 2001 From: Mahathi Mangipudi Date: Tue, 27 Jul 2021 07:23:56 +0000 Subject: [PATCH 8/8] 4th try --- day14/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/day14/README.md b/day14/README.md index 845af5b..0b68c82 100644 --- a/day14/README.md +++ b/day14/README.md @@ -1,5 +1,5 @@ Mahathi just created a new file in day14. Testing testing! Hi! -I am trying to create a conflictthis is bad conflict +I am trying to create a conflictthis is bad conflic editing the same line ! yayy t