oh-my-git/levels/conflict/description
2020-09-15 09:55:09 +02:00

3 lines
68 B
Text

Try merging the two branches together!
git merge <otherbranch>