From 5adc4e70a4c3fc21005f6b9dbfd960286aaf2323 Mon Sep 17 00:00:00 2001 From: dswiger Date: Sat, 23 Oct 2021 11:20:05 -0400 Subject: [PATCH 1/5] Minor change --- e.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/e.txt b/e.txt index d905d9d..7a2319a 100644 --- a/e.txt +++ b/e.txt @@ -1 +1,3 @@ e + +Minor change From e3bf97c1cafdf02a5b98ab41cf7b84625c4aaacf Mon Sep 17 00:00:00 2001 From: dswiger Date: Sat, 23 Oct 2021 12:09:47 -0400 Subject: [PATCH 2/5] adding file to branch --- dan.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 dan.txt diff --git a/dan.txt b/dan.txt new file mode 100644 index 0000000..33d8047 --- /dev/null +++ b/dan.txt @@ -0,0 +1 @@ +this is a new file only in my branch From b99b892baf62c1bc7c310af2702fd1327017a963 Mon Sep 17 00:00:00 2001 From: dswiger Date: Sat, 23 Oct 2021 12:16:06 -0400 Subject: [PATCH 3/5] First change for conflict. --- e.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e.txt b/e.txt index 7a2319a..87bfc3c 100644 --- a/e.txt +++ b/e.txt @@ -1,3 +1,3 @@ e -Minor change +MiNor change From 9d6af116831ddb2f9ecb781aa9cbc971bb1ef1e4 Mon Sep 17 00:00:00 2001 From: dswiger Date: Sat, 23 Oct 2021 12:17:19 -0400 Subject: [PATCH 4/5] Second commit for conflict --- e.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e.txt b/e.txt index 7a2319a..d9083b7 100644 --- a/e.txt +++ b/e.txt @@ -1,3 +1,3 @@ e -Minor change +Minor Change From 5171313fd649eb236d12b368733296af079b6cce Mon Sep 17 00:00:00 2001 From: dswiger Date: Sat, 23 Oct 2021 12:18:09 -0400 Subject: [PATCH 5/5] A non-conflicting change --- dan.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dan.txt b/dan.txt index 33d8047..075c326 100644 --- a/dan.txt +++ b/dan.txt @@ -1 +1,3 @@ this is a new file only in my branch + +changing something that won't conflict in master