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

Rewording

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

2
assignment1/README.md
View File

@ -5,7 +5,7 @@
In this first assignment you are tasked to create a very basic version control system (VCS) similar to [Git](https://git-scm.com/) or [Mercurial](https://www.mercurial-scm.org/). In this first assignment you are tasked to create a very basic version control system (VCS) similar to [Git](https://git-scm.com/) or [Mercurial](https://www.mercurial-scm.org/).
For this assignment you are *not* allowed to work in teams. For this assignment you are *not* allowed to work in teams.
You are not allowed to use code from other people participating in this course. You are *not* allowed to use code from other people participating in this course.
Always state the origin of non-original code and ideas. Always state the origin of non-original code and ideas.
It is recommend to be familiar Git to understand the intensions behind the following commands. It is recommend to be familiar Git to understand the intensions behind the following commands.

8
assignment1/lit-test
View File

@ -119,11 +119,11 @@ EOF
lit log lit log
echo "== Setting up a conflict" echo "== Setting up a conflict"
echo >>file1 "Fifth line ontop of r4." echo >>file1 "Fifth line on top of r4."
lit commit "Extend file1 one way" # r5 lit commit "Extend file1 one way" # r5
lit checkout r3 lit checkout r3
echo >>file1 "Third line ontop of r3." echo >>file1 "Third line on top of r3."
lit commit "Extend file1 another way" # r6 lit commit "Extend file1 another way" # r6
# o ← r6 Extend file1 another way # o ← r6 Extend file1 another way
@ -146,14 +146,14 @@ diff -s file1 - <<-EOF
This is the second line of the first file. This is the second line of the first file.
A third line is added to the first file. A third line is added to the first file.
A forth line is added. A forth line is added.
Fifth line ontop of r4. Fifth line on top of r4.
EOF EOF
# other breanch # other breanch
diff -s file1.r6 - <<-EOF diff -s file1.r6 - <<-EOF
This is the first line of the first file. 🚀 This is the first line of the first file. 🚀
This is the second line of the first file. This is the second line of the first file.
Third line ontop of r3. Third line on top of r3.
EOF EOF
# common base # common base