Sheriffing/How To/Merge Conflicts: Difference between revisions

Sheriffing/How To/Merge Conflicts (view source)

89 bytes removed , 21 July 2017

no edit summary

canmove, Confirmed users

2,850

edits

@@ Line 1: / Line 1: @@
+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.
-In some cases during Merges Sheriffs might run into Merge Conflicts
-Resolving Merge Conflicts by others than the inital Developers can cause Problems, so Sheriffs try not to resolve Merge conflicts when the change is not trivial for Sheriffs. In this case we backout the changeset causing the Merge-Conflict.
-However on the discretion of the individual Sheriff and available time, a Sheriff might be able to resolve also more complicated merge conflicts. In this case this on a volunteer base and not general rule :)