Transaction.push_patch(): Set self.head only when we have a merge conflict