Add comments capability in MR conflicts view

Problem to solve

Point a specific line in the MR conflicts view and add a comment or a question.

Further details

Ask question to the other devs regarding conflicts in the MR.

Proposal

Clic on the line number and a green comment symbol appear next to it. Clic on the comment symbol and a classic issue/comment/wiki form appears ready to be used.

When lines have comments, a not-green comment symbol could indicate the number of comments. Maybe a unfolded mod could open all comments on the side (bigger line number margin).

The comment should be listed in the main merge view in the comments list. Maybe with a special symbol and a direct link to the conflict line.

What does success look like, and how can we measure that?

you tell me.

Links / references

Edited Oct 27, 2018 by David Berlioz
Assignee Loading
Time tracking Loading