canmove, Confirmed users
2,850
edits
Sheriffing/How To/Merge Conflicts: Difference between revisions
Jump to navigation
Jump to search
no edit summary
ChrisCooper (talk | contribs) No edit summary |
ChrisCooper (talk | contribs) No edit summary |
||
| Line 1: | Line 1: | ||
{{Sheriffing How To|Merge conflicts}} | |||
During [[Sheriffing/How:To:Merges|merges]], sheriffs might run into merge conflicts. | During [[Sheriffing/How:To:Merges|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 [[Sheriffing/How:To:Backouts|backout]] the changeset causing the merge conflict. | 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 [[Sheriffing/How:To:Backouts|backout]] the changeset causing the merge conflict. | ||