Comments on: Entity Framework Models and Source Control

By: Scott Munro

Scott Munro — Fri, 17 Jun 2011 06:10:23 +0000

Hi Craig,

Thanks for this. You gave me the idea for a solution to this problem. In a nutshell, you can discard the designer related content and revert to a default layout. This means that you can bypass conflict resolution in this content altogether. See my StackOverflow post for details.

http://stackoverflow.com/questions/1434554/entity-framework-merge-nightmare/6381934#6381934

Cheers,

Scott

By: MdeJ

MdeJ — Sun, 03 Oct 2010 21:08:46 +0000

I’ve just added this feature to MultiFileEDMX. So, the layout of your diagrams are no longer discarded but saved in a separate file as well.

By: Craig Stuntz

Craig Stuntz — Mon, 16 Aug 2010 14:28:43 +0000

@MdeJ: Great idea! Would be even better if it stored the layout separately, too. That might fix the entire problem.

Ironically, this brings the file storage back to the way it was in early betas before the VS tooling folks decided to "improve" it by putting it in a single file.

By: MdeJ

MdeJ — Mon, 16 Aug 2010 14:25:36 +0000

You may find the MultiFileEDMX extension for VS2010 useful. It’s available at multifileedmx.codeplex.com