Revert reporting merges with conflicts as failed

Florian Heckrequested to merge
heckflor/GitWrapper:feature/merge-streategies into master

This reverts commit ef56db95, since the original behavior was more practical.

Merge request reports