[WIP] Resolve MR conflicts from web interface.
Created by: cirosantilli
When there are conflicts it shows:
Then under the conflicts URL, there is an AJAX tab like "Changes":
When done, user clicks on the "Resolve conflicts and merge pull request" button at the bottom to finish.
Detail of one of the conflicts:
For each conflict, user must select one of 4 radio boxes: ours, base, theirs, or custom.
ours, base and theirs will contain fixed values parsed directly from git checkout --conflict=diff3. Bytes that changed between ours and base and theirs and base are highlighted like in the diffs with idiff spans by Diffy.
custom will use the value of the textarea for a custom resolution. Its value defaults to ours which is a reasonable starting point for custom edits.
It is currently not possible to modify parts of the text outside of the conflict: one web UI workaround would be to leave them there, choose ours, merge the MR and only then those points by editing.
Tell me if the concept is OK so I can proceed do the backend.