Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-12-24 20:33:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge conflict level

Browse source
This commit is contained in:
Sebastian Morr 2020-09-15 09:55:09 +02:00
parent 7df489baf8
commit d71acccb38
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
levels/conflict/description Normal file
View file

@ -0,0 +1,3 @@
Try merging the two branches together!
git merge <otherbranch>

12
levels/conflict/start Normal file
View file

@ -0,0 +1,12 @@
echo ? > bikeshed_color
git add .
git commit -m "Initial commit"
echo green > bikeshed_color
git commit -a -m "My suggestion"
git switch -c alternative HEAD^
echo blue > bikeshed_color
git commit -a -m "This is way better"
git switch main