When Gerrit creates a cherry-pick with conflicts, it saves the change with conflict markers and asks the user to resolve the conflicts. By default, it uses the standard Git conflict style (“merge”), which only shows “ours” and “theirs”. This often makes it difficult to understand the conflict and, by extension, the correct resolution.
Since Gerrit 3.5, the conflictStyle configuration can apparently be used to select the “diff3” style instead (upstream commit; corresponds to merge.conflictStyle git config), which also shows the “base” version. In my experience, this makes it much easier to understand the conflict, as you can see which changes “ours” and “theirs” made relative to the “base”. I suggest we change the configuration to use “diff3” style. (Unfortunately, it sounds like this is only a system-wide setting, not one that can be changed by individual users.)
