title: Any concerns about branching/merging projects with Entity Framework
body: <p>I'm about to branch a project that uses EF.  I know that there will be a modicum of changes in the trunk, as well as many changes in the branch.  I will need to merge in changes from the trunk into the branch from time to time.</p>
  
  <p>I'm not concerned about the straight up C# code that usese EF objects (Linq to Entities) I'm concerned about the entity model itself? </p>