From 177b739ce73a8409a91f8f89875248aa6596ee9f Mon Sep 17 00:00:00 2001 From: colledwards Date: Mon, 6 Feb 2023 12:14:42 -0800 Subject: [PATCH 1/8] added file --- test.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.js diff --git a/test.js b/test.js new file mode 100644 index 0000000..3fc6884 --- /dev/null +++ b/test.js @@ -0,0 +1 @@ +console.log('pranked') \ No newline at end of file From dfb0bbf6fea4ddf487b50fb34f0574459369667f Mon Sep 17 00:00:00 2001 From: colledwards Date: Mon, 6 Feb 2023 12:16:33 -0800 Subject: [PATCH 2/8] fuji --- apples.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 apples.txt diff --git a/apples.txt b/apples.txt new file mode 100644 index 0000000..876d41c --- /dev/null +++ b/apples.txt @@ -0,0 +1 @@ +Fuji \ No newline at end of file From 51d344971efc734d64e60b8d296b86a7a1d3c0ef Mon Sep 17 00:00:00 2001 From: colledwards Date: Mon, 6 Feb 2023 12:18:32 -0800 Subject: [PATCH 3/8] readme edit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9d650b9..15bb45a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # Git Collaboration **GOAL**: In this project, you and your partner will be creating a list of apples in a text document, all version-controlled with Git! While this project has an apples-listing theme, the apples (and the project) is not the point: The real goal is to give us an introduction to how we’ll be collaborating via Git in the coming lessons. -Collaborators: _________________ +Collaborators: Collin, Rachel ## Part 1: First Edits and `git status` 1. Open the project in VS Code. From within your project directory, type code ., and that should open your project in VS Code. From 25429105b9f371d6008635f892689e52b85d6559 Mon Sep 17 00:00:00 2001 From: rachelboursia Date: Mon, 6 Feb 2023 12:26:01 -0800 Subject: [PATCH 4/8] updates apples.txt --- apples.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 apples.txt diff --git a/apples.txt b/apples.txt new file mode 100644 index 0000000..e69de29 From 1719af02724d4d61f37358d4390a7471a763f83b Mon Sep 17 00:00:00 2001 From: colledwards Date: Mon, 6 Feb 2023 12:29:48 -0800 Subject: [PATCH 5/8] removed --- apples.txt | 1 - test.js | 1 - 2 files changed, 2 deletions(-) delete mode 100644 apples.txt delete mode 100644 test.js diff --git a/apples.txt b/apples.txt deleted file mode 100644 index 876d41c..0000000 --- a/apples.txt +++ /dev/null @@ -1 +0,0 @@ -Fuji \ No newline at end of file diff --git a/test.js b/test.js deleted file mode 100644 index 3fc6884..0000000 --- a/test.js +++ /dev/null @@ -1 +0,0 @@ -console.log('pranked') \ No newline at end of file From 601a02fa6a9627fe67b56df979d94db473a67ee7 Mon Sep 17 00:00:00 2001 From: rachelboursia Date: Mon, 6 Feb 2023 12:36:48 -0800 Subject: [PATCH 6/8] Updates apples.txt --- apples.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apples.txt b/apples.txt index e69de29..5ff8735 100644 --- a/apples.txt +++ b/apples.txt @@ -0,0 +1,5 @@ +Here is a list of apples: + +granny smith +fuji +honey crisp \ No newline at end of file From ef5a3452f013502a880cefb1ececa8f76918a63a Mon Sep 17 00:00:00 2001 From: colledwards Date: Mon, 6 Feb 2023 12:39:43 -0800 Subject: [PATCH 7/8] removed apples --- apples.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apples.txt b/apples.txt index 5ff8735..e5692a6 100644 --- a/apples.txt +++ b/apples.txt @@ -1,5 +1 @@ -Here is a list of apples: - -granny smith -fuji -honey crisp \ No newline at end of file +No more apples! \ No newline at end of file From 09578631e2b5bbe930b33d2e1f9ebe5adc9e850a Mon Sep 17 00:00:00 2001 From: rachelboursia Date: Mon, 6 Feb 2023 12:42:40 -0800 Subject: [PATCH 8/8] Updates apples.txt --- apples.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apples.txt b/apples.txt index e5692a6..3f1f15e 100644 --- a/apples.txt +++ b/apples.txt @@ -1 +1 @@ -No more apples! \ No newline at end of file +granny smith apples \ No newline at end of file