To specify the desired mother or father, utilizes the -m flag. As git simply cannot pick which parent will be the mainline and which can be the branch to un-merge quickly, so this needs to be specified. The accurately marked remedy worked for me but I had to spend a while to ascertain whats going