Merging EMDX (Entity Framework) files with Git

As a team we are finding it difficult/impossible to merge EDMX files between branches and are considering a policy that all EDMX changes have to occur in the master branch. Has anyone encountered this issue, and how is your team handling it?

Git Baby is a git and github fan, let's start git clone.