mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2025-05-01 20:42:01 +02:00
Remove the fetch level for now
This commit is contained in:
parent
97a7c40ba3
commit
7da24b32e7
2 changed files with 1 additions and 1 deletions
levels/unused
35
levels/unused/fetch
Normal file
35
levels/unused/fetch
Normal file
|
@ -0,0 +1,35 @@
|
|||
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
|
Loading…
Add table
Add a link
Reference in a new issue