Bring level sequence up to date

This commit is contained in:
blinry 2021-02-07 10:59:24 +01:00
parent 7d8c05e78b
commit d5a7c2eb9e
7 changed files with 31 additions and 4 deletions

1
levels/bisect/sequence Normal file
View file

@ -0,0 +1 @@
bisect

View file

@ -1,3 +1,2 @@
merge merge
conflict conflict
merge-abort

22
levels/sandbox/remote Normal file
View file

@ -0,0 +1,22 @@
title = Sandbox with a remote
cards = checkout commit-auto pull fetch push
[description]
Here's a sandbox with a remote! Try pulling, fetching, or pulling!
How can you push tags and branches on a remote? How can you delete them again?
[setup yours]
echo "Line 1" > essay
git add .
git commit -m "Initial commit"
git push -u friend main
[setup friend]
git checkout main
echo "Line 2" >> essay
git commit -am "Another line"

View file

@ -1,2 +1,3 @@
empty empty
remote
three-commits three-commits

View file

@ -1,4 +1,4 @@
title = Sandbox title = Sandbox with three commits
cards = checkout add reset-file checkout-file commit merge rebase cards = checkout add reset-file checkout-file commit merge rebase
[setup] [setup]
@ -19,8 +19,8 @@ git branch not_main
Here's a sandbox you can play around in. Here's a sandbox you can play around in.
You can use both the playing cards, as well as the terminal. Fun things to try: You can use both the playing cards, as well as the terminal. This is a real Git terminal! Fun things to try:
- Make a commit that merges three timelines together at once! - Make a commit that merges three timelines together at once!
- Create some tags! - Create and delete some tags!
- Make a timeline that's completely independent of the rest! - Make a timeline that's completely independent of the rest!

View file

@ -8,4 +8,6 @@ changing-the-past
shit-happens shit-happens
workflows workflows
bisect bisect
stash
tags
sandbox sandbox

View file

@ -0,0 +1,2 @@
pr
gitignore