After resolving merge conflicts in interactive mode, have a clear distinction between committing ALL changes to source branch and just the specific resolved conflict

Release notes

Problem to solve

Merging from branch X into branch Y, in the occasion of a merge conflict you can decide to fix the problematic file(s) through GitLab’s interactive mode or “inline editor”.

After doing so (point 4), you are prompted to “Commit to source branch”, committing your conflict resolution to X. Doing this will not only commit the change(s) you made to resolve conflicts, but also EVERY OTHER change picked up by the merge summary, leading to possible commitment of unwanted code from branch Y into X. So against intuiton of only having manually changed a few lines of code to resolve the conflict, the target branch Y gets entirely merged back into the source branch X.

Proposal

Upon committing your merge resolution changes:

• Have, as a new default, the newly created commit only contain the changes you made to resolve conflicts and no others
• Have a checkbox next to the commit button that reads “Also include all other reported changes” which creates the commit as it does now by default.