Add conflict resolution instructions to staging.yaml

@NoahCarnahan @emord @twymer based on what we just talked about.  Lemme know if this isn't clear, or feel free to push clarifications to this PR.
I swear @dannyroberts wrote this up somewhere. might have just been a comment on github though.