oh-my-git/levels/experiments/pull-merge-push

30 lines
595 B
Text
Raw Permalink Normal View History

2020-10-06 10:51:12 +02:00
[description]
You want to push your new commits to the server, but someone has already pushed their own changes.
In this situation, you need to pull first! Try that here - you'll have to resolve a merge conflict. Push your changes afterwards.
[congrats]
Good job! Here's some additional info: banana!
[setup yours]
echo fu > file
git add .
git commit -m "Initial commit"
2020-10-06 17:36:20 +02:00
git push -u origin main
2020-10-06 10:51:12 +02:00
echo fi > file
git commit -a -m "Fi is good"
[setup origin]
echo fa > file
git add .
git commit -a -m "Fa is good"
[win origin]
test "$(git rev-parse HEAD^1^)" = "$(git rev-parse HEAD^2^)"