GitLab 2016 year in review

What this post added

This post details the introduction of Merge Conflict Resolution into the GitLab web interface, allowing users to resolve simple conflicts directly from GitLab. It also introduces Merge Request Discussion Resolution, enabling comments and discussions on merge request diffs to be resolved individually or in threads, preventing feedback from being missed.