Entity Framework & Resolving Team Migration Conflicts Zack Davy 18 Sep 2015 Coding I've been working on a .NET project for the past few months. In this project we're using the Entity Framework, which is an ORM for...more.