From f7ea8d2109910764b57498578736763daed440da Mon Sep 17 00:00:00 2001 From: c-poole Date: Thu, 13 Feb 2020 15:00:51 -0600 Subject: [PATCH 1/3] commit for example PR --- MergeConflictFile.txt | 1 + newfile.txt | 0 2 files changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/MergeConflictFile.txt b/MergeConflictFile.txt index 94c94ea..ec71b5b 100644 --- a/MergeConflictFile.txt +++ b/MergeConflictFile.txt @@ -1,2 +1,3 @@ Initial Phrase (I added this bit online!) (and I added this bit on my local) +svw \ No newline at end of file diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 0000000..e69de29 From a3393f6f73d326978039ad8851a492d52df6e9c1 Mon Sep 17 00:00:00 2001 From: c-poole Date: Thu, 13 Feb 2020 15:02:15 -0600 Subject: [PATCH 2/3] remove file from PR --- MergeConflictFile.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/MergeConflictFile.txt b/MergeConflictFile.txt index ec71b5b..94c94ea 100644 --- a/MergeConflictFile.txt +++ b/MergeConflictFile.txt @@ -1,3 +1,2 @@ Initial Phrase (I added this bit online!) (and I added this bit on my local) -svw \ No newline at end of file From 968e772576a7a598ed9af6310047f927a8ea8f91 Mon Sep 17 00:00:00 2001 From: c-poole Date: Thu, 13 Feb 2020 15:04:19 -0600 Subject: [PATCH 3/3] put change in MergeConflictsFile --- MergeConflictFile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/MergeConflictFile.txt b/MergeConflictFile.txt index 94c94ea..3675882 100644 --- a/MergeConflictFile.txt +++ b/MergeConflictFile.txt @@ -1,2 +1,3 @@ Initial Phrase (I added this bit online!) (and I added this bit on my local) +re \ No newline at end of file