From 7937955eb40211c25368d199dd507db7e4415c53 Mon Sep 17 00:00:00 2001 From: Laura Bradley Date: Fri, 18 Oct 2019 12:19:14 -0400 Subject: [PATCH 1/7] add a new file --- my_new_branch_file.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 my_new_branch_file.txt diff --git a/my_new_branch_file.txt b/my_new_branch_file.txt new file mode 100644 index 0000000..e69de29 From cc8e4c2304fdd85ffc3f9ce2d09075f018c609ed Mon Sep 17 00:00:00 2001 From: Laura Bradley Date: Mon, 21 Oct 2019 20:21:53 -0400 Subject: [PATCH 2/7] Merge conflict --- orange.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 orange.txt diff --git a/orange.txt b/orange.txt new file mode 100644 index 0000000..7d28f89 --- /dev/null +++ b/orange.txt @@ -0,0 +1 @@ +I'm in new_grocery_list From 45728f34ba59c5a32fa34c96e6d1cf8a2e592e93 Mon Sep 17 00:00:00 2001 From: Laura Bradley Date: Mon, 21 Oct 2019 20:22:54 -0400 Subject: [PATCH 3/7] Merge conflict --- orange.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 orange.txt diff --git a/orange.txt b/orange.txt new file mode 100644 index 0000000..e69de29 From ce058dc212bdaab3feaa6175d57a88c7653b5e89 Mon Sep 17 00:00:00 2001 From: Laura Bradley Date: Mon, 21 Oct 2019 21:17:09 -0400 Subject: [PATCH 4/7] Merge conflict --- orange.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/orange.txt b/orange.txt index e69de29..7d28f89 100644 --- a/orange.txt +++ b/orange.txt @@ -0,0 +1 @@ +I'm in new_grocery_list From 2d4311ab72940153915d3f3e40f025c05ad3149a Mon Sep 17 00:00:00 2001 From: Laura Bradley Date: Mon, 21 Oct 2019 21:18:57 -0400 Subject: [PATCH 5/7] Merge conflict --- orange.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orange.txt b/orange.txt index 7d28f89..287141b 100644 --- a/orange.txt +++ b/orange.txt @@ -1 +1 @@ -I'm in new_grocery_list +I'm in master From 7c85359585ae9be88dae428f8ff7e21059d3f37b Mon Sep 17 00:00:00 2001 From: Laura Bradley Date: Mon, 21 Oct 2019 21:32:50 -0400 Subject: [PATCH 6/7] Change from clone --- apple.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 apple.txt diff --git a/apple.txt b/apple.txt new file mode 100644 index 0000000..8a5b021 --- /dev/null +++ b/apple.txt @@ -0,0 +1 @@ +Change from clone From b4629d9960a164772dd68a68dd7df3c4a176ba6d Mon Sep 17 00:00:00 2001 From: Laura Bradley Date: Mon, 21 Oct 2019 22:17:32 -0400 Subject: [PATCH 7/7] Add README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7c72a2..15a8ccb 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# the_pantry +GitHub Checkpoint Assignment