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 "intro" to "high-level" and "internals" to "low-level"

Browse source
This commit is contained in:
Sebastian Morr 2020-10-12 19:00:32 +02:00
parent 09c54bfbdd
commit 79d89de5e7
27 changed files with 0 additions and 0 deletions
levels/internals
conflict

43
levels/internals/conflict
View file

@ -1,43 +0,0 @@
[description]
(This is not a real puzzle yet.)
Try merging the two branches together!
git merge <otherbranch>
[setup]
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
[setup goal]
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
git merge alternative
echo blue-green > bikeshed_color
git add .
git commit -m "Merge"
git prune