Conflict Resolution Plugin

This plugin adds a context menu option on conflict notes to open a merge menu. Once clicked a diff viewer will be shown to aid in merging the notes together.

!Preview

Timeline

$3

- Start work on plugin user interface.
- Add original note ID to conflicting note data.
- Add conflict menu notification and button to open the plugin window.

$3

- Create plugin initial behavior for loading the notes.
- Add Save and Cancel behaviors.
- Write tests to make sure basic plugin works as intended.

$3

- Submit forum for Community feedback of the plugin.
- Submission of the first evaluation.
- University final exams period (from first of July until 15th)

$3

- University final exams period (from first of July until 15th)
- Implement any feedback from the community and/or bugs.

$3

- Implement any leftover feedback from the community and/or bugs.
- If all is done, I could maybe start working on another plugin, preferably a MathTex Autocomplete plugin. To be completed post-GSoC if not done within the time.

$3

- Do any leftover work in the main GSoC plugin. Extra week just in case.

$3

- Review all code and cleanup.
- Code delivery.
- Mentor Evaluation.