Sheriffing/How To/Merge Conflicts
Jump to navigation
Jump to search
During merges, sheriffs might run into merge conflicts.
Resolving merge conflicts without the domain knowledge of the original patch author is prone to error. Sheriffs should not to resolve merge conflicts except for trivial cases or they possess the required domain knowledge. In almost all cases, it is safer to simply backout the changeset causing the merge conflict.