Git

Resolving merge conflicts can be a bit tricky. This guide addresses the scenario where you created a merge request to merge your-feature-branch into develop but GitLab tells you that the merge is blocked due to conflicts that you can't see in your local copy of the code. Here’s a