oh-my-git/levels/internals/conflict/description
2020-10-01 15:03:02 +02:00

5 lines
102 B
Text

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