Any concerns about branching/merging projects with Entity Framework

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.

I'm not concerned about the straight up C# code that usese EF objects (Linq to Entities) I'm concerned about the entity model 开发者_JAVA百科itself?

---

The branching / merging / and concurrent development story for EF entity models is a known sore spot. I think you are just going to have to manually merge the differences in the cases when automerge fails. Alternatively, you could go with the code only approach added in EF 4 and forget about entity models altogether.

You may want to check out this related question if you haven't already:

Entity Framework Merge Nightmare