Resolving Merge Conflicts from the GitLab UI

What this post added

This post details the introduction of the ability to resolve merge conflicts directly within the GitLab UI, starting in version 8.11. It explains the background of merge conflicts, why they are a problem, and the current implementation which involves getting a list of conflicted files, generating a merged file with conflict markers, parsing these markers to present to the UI, and then creating a merge commit. It also outlines limitations such as binary files, non-UTF-8 encodings, and large files, and future plans for an inline editor, binary file support, and rename conflict detection.