From 7315eaba38f7110de0b8cf3bf19c2997815b8657 Mon Sep 17 00:00:00 2001 From: Alex Hirsch Date: Tue, 29 Sep 2020 13:36:54 +0200 Subject: [PATCH] Clearify merge conflict resolution test --- assignment1/lit-test | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/assignment1/lit-test b/assignment1/lit-test index 901f41a..5425bc4 100755 --- a/assignment1/lit-test +++ b/assignment1/lit-test @@ -162,11 +162,25 @@ diff -s file1.r3 - <<-EOF This is the second line of the first file. EOF -# To resolve the conflict, we simply take the version of the current commit. +# Let's simulate some conflict resolution. +echo >>file1 "Sixth line added during merge conflict." + +# Before continuing we need to cleanup the leftover files. rm file1.r6 file1.r3 lit commit # r7 +# Let's verify the final result. + +diff -s file1 - <<-EOF + This is the first line of the first file. 🚀 + This is the second line of the first file. + A third line is added to the first file. + A forth line is added. + Fifth line on top of r4. + Sixth line added during merge conflict. +EOF + # o─┐ ← r7 Merge r6 into r5 # │ o r6 Extend file1 another way # o │ r5 Extend file1 one way