SVN: Can we merge/resolve conflict entityframework (EDMX) file in ASP.NET using SVN branching?

Hello,

We have a project in which we have .EDMX file.
We need to implement branching for release and parallel development.
Could you please confirm SVN automatically merge/resolve conflict for EDMX file?

Or do you have other thoughts?

Best Regards,
Mohit Pandit
LVL 6
MohitPanditAsked:
Who is Participating?

[Product update] Infrastructure Analysis Tool is now available with Business Accounts.Learn More

x
I wear a lot of hats...

"The solutions and answers provided on Experts Exchange have been extremely helpful to me over the last few years. I wear a lot of hats - Developer, Database Administrator, Help Desk, etc., so I know a lot of things but not a lot about one thing. Experts Exchange gives me answers from people who do know a lot about one thing, in a easy to use platform." -Todd S.

sarabandeCommented:
.EDMX files are xml text files. because of that svn has no problems to merge them, however, if two changes were made from different workspaces where the range of lines overlaps, you need to merge manually at check-in same as with any other source file.

Sara
0
MohitPanditAuthor Commented:
Okay, I got it for xml files.

For you comment, "if two changes were made from different workspaces where the range of lines overlaps, you need to merge manually at check-in same as with any other source file"
Do you mean, we need to resolve conflict manually?

Apart, do you have any tutorial or video tutorial link for that so that it will be more helpful?

Best Regards
0
sarabandeCommented:
thta isn't special for xml files but for all text files. if two (or more) developers have made changes at the same line position of a text file (compared to the common base where the two revisions have been derived from), then "automerge" will fail and you have to do a manual merge by using a merge/diff tool. the tool will show you both revisions side-by-side and the merge result at the bottom. you then can navigate from a conflict to the next and decide which version is the right one (or add the solution manually).

Sara
0

Experts Exchange Solution brought to you by

Your issues matter to us.

Facing a tech roadblock? Get the help and guidance you need from experienced professionals who care. Ask your question anytime, anywhere, with no hassle.

Start your 7-day free trial
MohitPanditAuthor Commented:
Okay, I'll check & let you update.

Best Regards
0
MohitPanditAuthor Commented:
Thanks
0
It's more than this solution.Get answers and train to solve all your tech problems - anytime, anywhere.Try it for free Edge Out The Competitionfor your dream job with proven skills and certifications.Get started today Stand Outas the employee with proven skills.Start learning today for free Move Your Career Forwardwith certification training in the latest technologies.Start your trial today
Version Control

From novice to tech pro — start learning today.