Merging does work technically : ) You just should fix the merge conflicts.
We will likely update the repo to latest cmangos soon as we have had few requests of that and cmangos classic got a big update recently it seems.
If you dont know how to fix the merge conflicts, please do not try merging with latest cmangos revision at the moment.