To specify the specified mum or dad, utilizes the -m flag. As git are not able to decide which mother or father may be the mainline and which is the branch to un-merge mechanically, so this have to be specified.– jstine Commented Sep 28, 2015 at fifteen:38 The situation with this technique, is always that When you have an important bit of code b