Improve Merge Conflict dialog with two or three text panes

archimatetool / archi-modelrepository-plugin

coArchi - a plug-in to share and collaborate on Archi models.

153 stars 53 forks source link

Improve Merge Conflict dialog with two or three text panes #8

Closed Phillipus closed 7 years ago

Phillipus commented 7 years ago

At the moment we can see the merge diff result in the Merge Conflict dialog window. It would be nice to see "ours" on the left, "theirs" on the right with maybe the diff in the middle.

Obviously the longer term solution is to have a more appropriate representation of the diff. See http://modeling-languages.com/smart-model-versioning/

Phillipus commented 7 years ago

Need to figure out how to load the version of the file from the index before the merge attempt ("ours") and the version from repo's "origin" ("theirs").

Help needed!

Phillipus commented 7 years ago

This is done now.