From da4cdfbd863fcf94015cd427506caa0b6a0c3cfc Mon Sep 17 00:00:00 2001 From: matthew-beep Date: Wed, 11 Jan 2023 10:50:56 -0800 Subject: [PATCH 1/4] merging line 2 --- file1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file1.txt b/file1.txt index 140926d..231f94a 100644 --- a/file1.txt +++ b/file1.txt @@ -1,3 +1,3 @@ Welcome to INFO 442 Week 2. -Merge conflicts are annoying. +Conflicts are awesome. Hopefully rebasing can help in collaboration! \ No newline at end of file From 23642939af925e3db2ecb31f64f66b9ab263d971 Mon Sep 17 00:00:00 2001 From: matthew-beep Date: Wed, 11 Jan 2023 10:55:27 -0800 Subject: [PATCH 2/4] creating merge conflict --- file1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file1.txt b/file1.txt index 140926d..3f343ca 100644 --- a/file1.txt +++ b/file1.txt @@ -1,3 +1,3 @@ Welcome to INFO 442 Week 2. -Merge conflicts are annoying. +I'm eating pizza. Hopefully rebasing can help in collaboration! \ No newline at end of file From 064b004a688bb453afc7fd6823fa8c40284e68be Mon Sep 17 00:00:00 2001 From: matthew-beep Date: Wed, 11 Jan 2023 10:50:56 -0800 Subject: [PATCH 3/4] merging via rebase main and mybranch --- file1.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/file1.txt b/file1.txt index 3f343ca..95bc386 100644 --- a/file1.txt +++ b/file1.txt @@ -1,3 +1,7 @@ Welcome to INFO 442 Week 2. +<<<<<<< HEAD I'm eating pizza. +======= +Conflicts are awesome. +>>>>>>> da4cdfb (merging line 2) Hopefully rebasing can help in collaboration! \ No newline at end of file From 6877dceb2754e0e728d59a681ded44f843eac517 Mon Sep 17 00:00:00 2001 From: matthew-beep Date: Wed, 11 Jan 2023 11:05:51 -0800 Subject: [PATCH 4/4] gonna merge --- file1.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/file1.txt b/file1.txt index 95bc386..231f94a 100644 --- a/file1.txt +++ b/file1.txt @@ -1,7 +1,3 @@ Welcome to INFO 442 Week 2. -<<<<<<< HEAD -I'm eating pizza. -======= Conflicts are awesome. ->>>>>>> da4cdfb (merging line 2) Hopefully rebasing can help in collaboration! \ No newline at end of file