Skip to content

Features Plans Compatibility Guide For Education Support

Guide topics

Guide home Every guide, A to Z

Start here

Getting Started Your Library Playing a Score

Plans and licences

Plans and pricing Licences and keys Install with TestFlight Refunds and cancellation Education and schools

Practise

Tuner & Wait for Me Record & Review Scales & Arpeggios Annotating

Sound and words

Backing Tracks & Sound Lyrics & Karaoke

Write and keep

Writing & Editing Music Version History & GitHub

Save a version Start a branch to try an idea Roll back to an earlier version Merge a branch Resolve merge clashes Connect a score to GitHub Where your GitHub token is kept

Share, Export & Print

Together

Settings and help

Keyboard Shortcuts Settings & Accessibility Troubleshooting

Your devices and privacy

Devices and compatibility Privacy and permissions

← Version History & GitHub

Merge a branch

Merge brings another branch into the current one, bar by bar. A bar changed on only one branch comes across.

Related

Resolve merge clashes
Start a branch to try an idea
Version History & GitHub

← Roll back to an earlier version Resolve merge clashes →

Maestro Pro Guide For Education Support Feedback Privacy Caffeine Media X Truth Social LinkedIn

© 2026 The Caffeine Media Company.