f1477dbfa562 ("docs: add backporting and conflict resolution document")