diff --git a/levels/low-level/conflict b/levels/experiments/conflict similarity index 100% rename from levels/low-level/conflict rename to levels/experiments/conflict diff --git a/levels/high-level/first-remote b/levels/high-level/first-remote new file mode 100644 index 0000000..40c0825 --- /dev/null +++ b/levels/high-level/first-remote @@ -0,0 +1,31 @@ +[description] + +A friend has asked you to help with an essay about hobbies! She has already started to write a list, started tracking it in a Git repository. You can get a copy by typing + + git pull friend main + +Help her by adding at least two more items to the list! When you're done, commit your result and use + + git push friend main + +to send it to her copy of the repository! + +[congrats] + +"Thanks, these are some really nice hobbies! Hope we can do that together soon!" + +[setup] + +[setup friend] + +echo "~ Best hobbies ~ + +- Collecting stamps +- Looking at clouds" >> hobbies.txt + +git add . +git commit -m "Initial list (I definitely need more)" + +[win friend] + +test "$(git show HEAD:hobbies.txt |wc -l)" -ge 6 diff --git a/levels/high-level/motivation b/levels/high-level/motivation index 1c426a6..5fa3049 100644 --- a/levels/high-level/motivation +++ b/levels/high-level/motivation @@ -1,5 +1,7 @@ [description] +(This chapter is not a complete introduction to Git yet, but it will explain some of the basic concepts to you.) + So you've been working on an essay about goldfish. You can look at the backup copies you made by clicking on them! But look - something went wrong in the latest version of the file! Maybe it has been infected with a vowel-eating virus? diff --git a/levels/low-level/puzzle-apocalypse b/levels/low-level/puzzle-apocalypse index 7e9b6a4..119784d 100644 --- a/levels/low-level/puzzle-apocalypse +++ b/levels/low-level/puzzle-apocalypse @@ -5,11 +5,8 @@ Delete all objects in this repository using git commands only! Useful commands: git prune - git fsck git reflog expire -Note: I'm not sure how to beat this level. :D - [setup] echo foo > foo diff --git a/levels/low-level/welcome b/levels/low-level/welcome index 7a6b172..d669136 100644 --- a/levels/low-level/welcome +++ b/levels/low-level/welcome @@ -2,7 +2,7 @@ This is prototype #1 for the Git learning game by @bleeptrack and @blinry. Thanks for checking it out! <3 -You can interact with the repository on the right by typing Bash commands in the terminal below! The visualization will show you its internal status. +You can interact with the repository labelled "yours" by typing Bash commands in the terminal below! The visualization will show you its internal status. Let's get started by initializing an empty Git repository in the current directory by typing: