But I would sync the map_diagram files.
Otherwise, unexpected behavior may occur, for example when importing modifications into a workspace which had a previous version of the mapping.
Moreover, these files contain the "Notes" which may be added by the developer to the mapping diagram. You might want to keep those
We definitely want to bring more simplicity to VCS users. Within a few days we plan to release an article with best practices. I will inform you here when it is released.