Hello, I was attempting to perform a minor point upgrade between moodle 3.9.1+ and 3.9.2 and had 4 merge conflicts which did not make sense to me.
- version.php
- CONFLICT (content): Merge conflict in lib/tests/behat/behat_hooks.php
- CONFLICT (content): Merge conflict in lib/classes/output/icon_system.php
- CONFLICT (content): Merge conflict in .travis.yml
I do not understand why these 4 files had merge conflict errors - none are customized.
They were easy to resolve but has me wondering why they were actually conflicts in the first place.
Any advise - Simple merges.