h44z/uibk_703807-Advanced-CXX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clearify merge conflict resolution test

Browse Source
This commit is contained in:
Alex Hirsch 2020-09-29 13:36:54 +02:00
parent ea2fd24834
commit 7315eaba38
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
assignment1/lit-test
View File

@ -162,11 +162,25 @@ diff -s file1.r3 - <<-EOF
This is the second line of the first file. This is the second line of the first file.
EOF 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 rm file1.r6 file1.r3
lit commit # r7 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─┐ ← r7 Merge r6 into r5
# │ o r6 Extend file1 another way # │ o r6 Extend file1 another way
# o │ r5 Extend file1 one way # o │ r5 Extend file1 one way