Entity Framework Merge Nightmare

Question

We\'ve adopted the Entity Framework and we\'re finding that when multiple people make isolated changes in their individual source control branches, there are massive conflic

Answer 1

I actually tried to convince my company to go to Code First for this very reason, and was shut down, unfortunately. They like being able to use the designer. Unfortunately, I ran in to issues on our last production deploy where one of our WCF services has about 10 end points in it to support multiple consumers, and in the process of merging, there were several duplicated entries in the C-S section of the EDMX file.

In my personal projects, I'm using Code First exclusively. To me, it's the same reason I prefer manual over automatic transmission. Sure, the model designer may be easier (sometimes, as we've discussed), but with Code First, you get much more direct control of what's going on. Just like a manual transmission. :)