@auditor resolve conflicts merges the base branch in and settles the conflicts

Comment @auditor resolve conflicts on a pull request that conflicts with its base branch. Auditor merges the base branch in: files only one side changed take that side, files both changed are merged line by line, and only the lines that still conflict go to the model, with the pull request's description and the base branch's commit messages, so both changes survive. The result is a real merge commit of the base branch as it is at that moment, committed straight onto your branch as GitHub's own Resolve conflicts does, with each file's resolution explained.