To specify the desired parent, uses the -m flag. As git simply cannot determine which guardian is the mainline and which happens to be the department to un-merge mechanically, so this needs to be specified. a+ opens for appending and examining, enabling you each to append on the file as well as r