[BLUEJ-1109] Support Conflicts for Stride files
If a Stride file is involved in a conflict, an Exception will be thrown and the operation will abort fully.
An easy solution is to give the user the choice earlier to pick one of the versions.
A more advanced solution is to analyse the XML difference and offer the conflicted block states as two disabled frames with comments indicating the sources.
Issue metadata
- Issue type: Task
- Priority: Medium