Sheriffing/How To/Merge Conflicts

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.

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 :)