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

5 lines
102 B
Text

(This is not a real puzzle yet.)
Try merging the two branches together!
git merge <otherbranch>