oh-my-git/levels/bottom-up/conflict/description

mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-12-28 20:32:59 +01:00
(This is not a real puzzle yet.)

Try merging the two branches together!

    git merge <otherbranch>
Polish levels some more, add a "congrats" text 2020-09-16 16:16:11 +02:00			`(This is not a real puzzle yet.)`

Merge conflict level 2020-09-15 09:55:09 +02:00			`Try merging the two branches together!`

			`git merge <otherbranch>`