oh-my-git/levels/conflict/description
2020-09-16 16:16:11 +02:00

5 lines
102 B
Text

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