mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-11-03 19:04:40 +01:00
Bring level sequence up to date
This commit is contained in:
parent
7d8c05e78b
commit
d5a7c2eb9e
7 changed files with 31 additions and 4 deletions
1
levels/bisect/sequence
Normal file
1
levels/bisect/sequence
Normal file
|
@ -0,0 +1 @@
|
|||
bisect
|
|
@ -1,3 +1,2 @@
|
|||
merge
|
||||
conflict
|
||||
merge-abort
|
||||
|
|
22
levels/sandbox/remote
Normal file
22
levels/sandbox/remote
Normal 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"
|
|
@ -1,2 +1,3 @@
|
|||
empty
|
||||
remote
|
||||
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!
|
||||
|
|
|
@ -8,4 +8,6 @@ changing-the-past
|
|||
shit-happens
|
||||
workflows
|
||||
bisect
|
||||
stash
|
||||
tags
|
||||
sandbox
|
||||
|
|
2
levels/workflows/sequence
Normal file
2
levels/workflows/sequence
Normal file
|
@ -0,0 +1,2 @@
|
|||
pr
|
||||
gitignore
|
Loading…
Reference in a new issue