1. commit before chery pick