• Status: Solved
  • Priority: Medium
  • Security: Public
  • Views: 525
  • Last Modified:

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
0
MohitPandit
Asked:
MohitPandit
  • 3
  • 2
1 Solution
 
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
 
MohitPanditAuthor Commented:
Okay, I'll check & let you update.

Best Regards
0
 
MohitPanditAuthor Commented:
Thanks
0
Question has a verified solution.

Are you are experiencing a similar issue? Get a personalized answer when you ask a related question.

Have a better answer? Share it in a comment.

Join & Write a Comment

Featured Post

Cloud Class® Course: Ruby Fundamentals

This course will introduce you to Ruby, as well as teach you about classes, methods, variables, data structures, loops, enumerable methods, and finishing touches.

  • 3
  • 2
Tackle projects and never again get stuck behind a technical roadblock.
Join Now