Issue with ADS basic merge conflict : <<<<<<< HEAD", "=======" and ">>>>>>>" separators

ADS

When there is a conflict in merge between branches ADS displays a dialog as attached, but no standard conflict-resolution markers are added to the files in the branches. This makes it hard for users to edit the files and merge.

git tool

When there is a conflict in merge between branches users needs to manually fix the conflict and then perform the merge. The git tool will add standard conflict-resolution markers to the files that have conflicts, so users can open them manually and resolve those conflicts.

For e.g 

<<<<<<< HEAD:index.html
<div id="footer">contact : email.support@github.com</div>
=======
<div id="footer">
 please contact us at support@github.com
</div>
>>>>>>> iss53:index.html

This means the version in HEAD (your master branch, because that was what you had checked out when you ran your merge command) is the top part of that block (everything above the =======), while the version in your iss53 branch looks like everything in the bottom part. In order to resolve the conflict, you have to either choose one side or the other or merge the contents yourself.

Refer: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflictshttps://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts

This is known... The ask is for ER Modeler XML xed files to be able to be opened in the ER Modeler tool while merging conflicts so that conflicts can be resolved within the tool instead of manually editing the XML of the xed file.  Ideally you would be able to view the version differences in different color backgrounds to visually be able to identify the differences.  After resolving conflict differences there should be a way to save the accept version changes to the model and to resave the model for as an updated version and commit and push to the repo to resolve the conflict.  Thanks