Merge conflicts can be very annoying for both merge request authors and reviewers. As an author, I just want my merge request to be merged. But the reviewer might not be in the same time zone as me and by the time they review my changes, I have a merge conflict. I then need to fix it and pass the merge request back to them, which is a lot of busy work for something that could be fairly trivial to fix.
Similarly, as a reviewer, I want merge requests to be accepted when they're ready. I don't want to spend my time checking out the author's branch, fixing the conflicts, and pushing back; and I don't particularly like waiting around for them to fix it. As an author or a reviewer, I just want to be able to have the merge request accepted, and move on to the next thing. That's why understanding the methods of resolving conflicts is crucial. Fortunately, GitLab has a few ways of resolving conflicts from the GitLab UI.
In GitLab 8.11, we introduced the ability to resolve merge conflicts in the UI. This post describes the background for the feature, how it works, and what we're planning to do next with it.
What is a merge conflict?
A merge conflict is when a merge can't be performed cleanly between two versions of the same file. An error message may appear, indicating the conflict is too complex.
Wait, what's a merge?
A merge is a way of combining two sets of changes made in different branches. In
GitLab, we handle this with Merge Requests, which are requests to merge
the changes we've made to a file (or a group of files), from a feature
branch into another branch, for example,
When the merge request is merged, the changes from
new-feature are added to
master. This happens by looking at all of the changes made in the
master branch since
new-feature branch was created, and all the changes made in
and applying them to the files changed.
Most of the time, Git can do this automatically, but sometimes it can't. For
instance, if we changed a line of code in our
new-feature branch, but that line was
also changed in
master, Git doesn't know which line to accept. When this happens, someone needs to manually tell Git which line
to use, which creates a merge conflict.
Note: for this post, we will just concentrate on conflicts within a file. However, renames and deletions can also cause conflicts, and we plan on supporting those in the future.
Why are merge conflicts a problem?
They're really annoying!
When there's a conflict in a version control system, a merge request can't be merged without manual intervention.
If you can't resolve complex merge conflicts within GitLab, that means that any merge request with a conflict needs to be checked out locally, resolved locally, pushed back, and merged. That's a hassle and can't be done without having some Git tools installed locally. At GitLab, we want everyone to be able to collaborate on all digital content, and that means not having to install special tools whenever possible.
Types of conflict resolution
There are several methods of resolving conflicts:
Just pick one version, and use that. This is often the case with generated files. One example is the
schema.rbfile in a Rails app. Conflicts on the schema version line are common, but we (almost) always want the latest version.
Keep the lines of code from both versions. A great example of this is the GitLab CE CHANGELOG file, which is a frequent source of merge conflicts. We're working on tooling to help with this, but that's specific to GitLab rather than applicable to every project.
Write our own resolution. For instance, if we started with the sentence:
There are two versions of GitLab: CE and EE
I might think that those acronyms should be spelled out:
There are two versions of GitLab: Community Edition (CE) and Enterprise Edition (EE)
And you might think that the sentence needs some closing punctuation:
There are two versions of GitLab: CE and EE.
Because conflicts are based on lines, there's no way to automatically pick both of those changes. We can do so manually, though:
There are two versions of GitLab: Community Edition (CE) and Enterprise Edition (EE).
At present, the conflict resolution support in GitLab is only really useful for resolving the first type of conflict. The merge conflict resolution editor allows for more complex conflicts to be resolved by manually modifying a file from the GitLab interface.
How do we resolve them?
When a merge request can have its conflicts resolved within GitLab, it will have a link within the merge box to 'resolve these conflicts':
Clicking that link will show a list of files with conflicts, with conflict sections highlighted as 'our changes' (the changes in the merge request's source branch) and 'their changes' (the changes in the merge request's target branch):
Here's an example of a more complex merge conflict in a
schema.rb that I resolved on the GitLab CE
How does that work?
The current implementation, at a high level, works like this:
- If a merge request has conflicts, GitLab gets a list of the files with merge conflicts.
- For each file, it then generates a merged file with conflict markers.
- GitLab parses those conflict markers out and presents them to the UI as sections: context, our side of the conflict, their side of the conflict, context, etc.
- When the UI passes the section IDs back, we do the same thing. This time, GitLab only keeps the sections the user selected, along with all context sections.
- GitLab joins the resolved lines together to create a resolved file, and adds it to the Git index.
- Finally, we write that index as a merge commit to the source branch.
If the source branch is
new-feature and the target branch is
this does basically the same thing as running:
git checkout new-feature
git merge master
Why can't some conflicts be resolved in GitLab?
The implementation above produces a number of constraints (for the most up-to-date list, please see the merge conflict resolution documentation):
- If the file contains conflict markers that mean we can't parse the file contents unambiguously, we can't show the sections. We will, however, be able to allow resolving those conflicts in an editor.
- If the file is a binary file, we can't parse the file for conflict markers because they are only added to text files. Again, we plan to allow resolving conflicts in binary files in the future.
- If the file isn't in a UTF-8 compatible encoding, we can't allow resolving it because we pass data back and forth as JSON.
- If the file is too large (over 200 KB), we avoid parsing it.
Because all conflicts must be resolved at once, if any of the conflicts for a merge request can't be resolved in the GitLab UI, then the conflicts must be resolved manually.
There are plenty of places for improving our current implementation, and we'd love to hear of ones we haven't thought of. Here are three obvious ones already in our issue tracker.
An inline editor!
The most obvious improvement is to allow editing the conflict resolution. This is closer to the experience on the command line, with the conflict markers present in the file. It will also cover most of the problem cases listed above with the current approach.
In addition to this, as binary files are typically not manually mergeable, we could just show both file versions, and ask which one to use. This will work best for images, but can support all binary files.
Incompatible renames are detected as conflicts by the
git command line tool,
but not by the library we use at GitLab. We can detect rename conflicts
ourselves, it's just more work.
For the latest information on how to resolve merge conflicts in GitLab, check out our documentation.