fix #26516: crash on repitch
fix #24482: ties broken on repitch
break ties into multi-note chords
fix ties with linked staves/parts
break ties into selected note
fix ties & rests on MIDI input
add comments
check for merge conflicts

coloring doesn't seem to work on Travis (it doesn't harm either), but
should on a plain Linux or Mac shell prompt
Merge pull request #992 from MarcSabatella/26516-repitch

fix #26516: crash on repitch
Merge pull request #990 from Jojo-Schmitz/check-for-merge-conflicts

check for merge conflicts
fix crash when loading 1.3 files with unknown style tags
fix: drum note entry using shortcut doesn't honor voice setting from drumset
fix #26591: Wrong clef / staff lines on MusicXML import