GitLab 06 🦊 Resolving Merge Conflicts and Handling Code Reviews
A merge conflict is not an error. It is a signal that two branches changed the same lines of the same file, and Git cannot decide which change to keep. The resolution is a human decision, made in the Git working tree, and then committed to the source branch. GitLab’s interface surfaces the conflict, offers…