mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-12-22 20:32:38 +01:00
34 lines
649 B
Text
34 lines
649 B
Text
|
title = Problems
|
||
|
|
cards = checkout add pull push commit-auto
|
||
|
|
|
||
|
|
[description]
|
||
|
|
|
||
|
|
Both you and your friend have been working on the file, and want to sync up!
|
||
|
|
|
||
|
|
[setup yours]
|
||
|
|
|
||
|
|
echo "The bike shed should be ???" > file
|
||
|
|
git add .
|
||
|
|
git commit -m "initial"
|
||
|
|
|
||
|
|
git push -u friend main
|
||
|
|
|
||
|
|
echo "The bike shed should be green" > file
|
||
|
|
|
||
|
|
[setup friend]
|
||
|
|
|
||
|
|
git checkout main
|
||
|
|
|
||
|
|
echo "The bike shed should be blue" > file
|
||
|
|
git commit -a -m "friends version"
|
||
|
|
|
||
|
|
[win]
|
||
|
|
|
||
|
|
# Commit your local changes.
|
||
|
|
test "$(git status -s)" = ""
|
||
|
|
|
||
|
|
[win friend]
|
||
|
|
|
||
|
|
# Look at your friend's suggestion, make a compromise, and push it back.
|
||
|
|
git show main:file | grep green && git show main:file | grep blue
|