diff --git a/levels/bisect/sequence b/levels/bisect/sequence new file mode 100644 index 0000000..e8018fe --- /dev/null +++ b/levels/bisect/sequence @@ -0,0 +1 @@ +bisect diff --git a/levels/merge/sequence b/levels/merge/sequence index cd94a4d..c3b6caf 100644 --- a/levels/merge/sequence +++ b/levels/merge/sequence @@ -1,3 +1,2 @@ merge conflict -merge-abort diff --git a/levels/sandbox/remote b/levels/sandbox/remote new file mode 100644 index 0000000..725090b --- /dev/null +++ b/levels/sandbox/remote @@ -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" diff --git a/levels/sandbox/sequence b/levels/sandbox/sequence index 0573100..29aa91f 100644 --- a/levels/sandbox/sequence +++ b/levels/sandbox/sequence @@ -1,2 +1,3 @@ empty +remote three-commits diff --git a/levels/sandbox/three-commits b/levels/sandbox/three-commits index d327b29..3e5308c 100644 --- a/levels/sandbox/three-commits +++ b/levels/sandbox/three-commits @@ -1,4 +1,4 @@ -title = Sandbox +title = Sandbox with three commits cards = checkout add reset-file checkout-file commit merge rebase [setup] @@ -19,8 +19,8 @@ git branch not_main 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! -- Create some tags! +- Create and delete some tags! - Make a timeline that's completely independent of the rest! diff --git a/levels/sequence b/levels/sequence index 6a76971..cefcd7a 100644 --- a/levels/sequence +++ b/levels/sequence @@ -8,4 +8,6 @@ changing-the-past shit-happens workflows bisect +stash +tags sandbox diff --git a/levels/workflows/sequence b/levels/workflows/sequence new file mode 100644 index 0000000..d2bb0d4 --- /dev/null +++ b/levels/workflows/sequence @@ -0,0 +1,2 @@ +pr +gitignore