Problem: Currently its a huge effort to resolve merge conflicts in microflows, pages, etc.
The changes tab doesn't help a lot since it only shows that some parts of a flow have been edited but not what was edited in detail. Also on pages it only shows stuff like "Widget value type" but as a developer its hard to tell (if not impossible) to see what actually changed.
Idea: Develop a side by side comparison tool where the page/flow can be viewed side by side with the local and the server values. Highlight the component which was changed and enable easy editing or even copy/pasting from one side to the other. In theory the interactive merge should be something like this, but its also not very usefull and not clear what side changed what. At the end the user could click "Continue with local/server" and then the currently viewed component on the side would overwrite the file and conclude the merge.
Benefit: To have a side by side view of both conflicting states would realy help to understand what was changed in detail. The copy/paste would enable easy alligning of both version. Better conflict solving would save a lot of time since with the current features often errors happen on merging and thus a version with faulty features is created. If this doesnt happen anymore it would save a lot of time after the merge fixing occuring errors.