oh-my-git/levels/conflict/description

6 lines
102 B
Text
Raw Permalink Normal View History

(This is not a real puzzle yet.)
2020-09-15 09:55:09 +02:00
Try merging the two branches together!
git merge <otherbranch>