Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2025-05-27 20:29:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add italian localizations and mechanism for card, levels and buttons and labels

Browse source
This commit is contained in:
Luca Canali 2021-09-06 23:15:34 +02:00
parent 2c275424a3
commit 705cc849c2
125 changed files with 131 additions and 71 deletions
levels/unused
fetch

35
levels/unused/fetch
View file

@ -1,35 +0,0 @@
title = Fetching from remotes
cards = checkout fetch commit-auto
[description]
Here, you already have two remotes configured! You can list them using `git remote`.
Fetch from both, and look at the suggestions.
Then, make a new commit on top of your original one that introduces a compromise.
[setup]
echo "The bikeshed should be ???" > proposal
git add .
git commit -m "What do you think?"
[setup friend1]
git pull yours main
echo "The bikeshed should be green" > proposal
git commit -am "Green"
[setup friend2]
git pull yours main
echo "The bikeshed should be blue" > proposal
git commit -am "Blue"
[win]
# Your proposal is acceptable for friend1.
git show main:proposal | git grep green
# Your proposal is acceptable for friend2.
git show main:proposal | git grep blue