MySQL Workbench team strategy I'm considering to use MySQL Workbench at work, mainly because of the modelling tools and to easily sync the development and the production DBs. I work with another developer on the same project, and we currently use GIT to version our work. In a perfect world it would be possible just to merge different changes in the models directly within GIT, but it's not possible, since the Workbench files are binary, so now I'm looking for a team strategy to work together with Workbench, share and update the same files and still be able to work on different features.

I also tried to extract the .mwb content to version the .xml inside it, but when it comes to merging it's very difficult to edit the XML involved without breaking/corrupting it.

Any suggestion? How did you solve this problem in your team?
We keep an .mwb file in the repo. Our team is small and changes to the schema are rare, so we can agree who modifies the file. 

If the team were bigger I would introduce a lock file in the repo that's created by a person who wants to make a change and who deletes it when the change is committed.