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

Rename chapters into "internals" and "intro"

Browse source
This commit is contained in:
Sebastian Morr 2020-10-01 15:03:02 +02:00
parent 70fe577788
commit f3ff5c5147
97 changed files with 0 additions and 0 deletions
levels/internals/conflict
descriptiongoalstart

5
levels/internals/conflict/description Normal file
View file

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

5
levels/internals/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

12
levels/internals/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