RelNoteson commit advice: Introduce error_resolve_conflict (38ef61c)
   1Documentation/RelNotes/1.7.6.txt