Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2025-06-01 19:19:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Polish levels some more, add a "congrats" text

Browse source
This commit is contained in:
Sebastian Morr 2020-09-16 16:16:11 +02:00
parent 6292d849b9
commit 5066840ae9
30 changed files with 87 additions and 30 deletions
levels/conflict
descriptiongoal

2
levels/conflict/description
View file

@ -1,3 +1,5 @@
(This is not a real puzzle yet.)
Try merging the two branches together!
git merge <otherbranch>

5
levels/conflict/goal Normal file
View file

@ -0,0 +1,5 @@
git merge alternative
echo blue-green > bikeshed_color
git add .
git commit -m "Merge"
git prune