Support a way to resolve (git) merge conflicts with Gaphor #388
Description
I'm submitting a...
- Bug report
- Feature request
- Documentation issue or request
Current behavior
If a merge conflicts arises because two people edited a model file at the same time, it's hard to resolve. There are two options:
- Interpret the XML and merge the right parts 🤞
- Pick one version and re-apply the changes the other person made (or remembers)
Expected behavior
We want to be able to resolve merge conflicts in a user friendly way.
We need to find out what a user friendly way is. via CLI or via the GUI? How to present "conflicts"? How to resolve those?
Should Gaphor be able to read a file containing a merge conflict?
NB. In the repo (tag 1.0.0) is a primitive compare tool (utils/compare.py). It may be useful for inspiration.
More refinement required, I suppose.