Resolve merge clashes
A bar changed on both branches clashes, and you choose to keep yours or take theirs. Bars are matched by number, so a bar added or removed early on one branch can make the rest show as clashes.
A bar changed on both branches clashes, and you choose to keep yours or take theirs. Bars are matched by number, so a bar added or removed early on one branch can make the rest show as clashes.