"Failed to save merge conflicts resolutions" does not show validation error

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

Summary

If a project has hooks that validate commits, conflict resolution can fail with a very vague "Failed to save merge conflicts resolutions. Please try again!".

Additionally, perhaps "Failed to save merge conflict resolutions" is a bit more correct.

Steps to reproduce

1. Set up serverside hooks that validate commit message.
2. Have a merge conflict.
3. Attempt to resolve it in the web GUI, use a commit message that would fail the validation.

What is the current bug behavior?

Fails with a vague "Failed to save merge conflicts resolutions. Please try again!".

What is the expected correct behavior?

Shows the hook error message.

Output of checks

This bug happens on GitLab.com.