How-to reconcile metadata differences of a messed up pull-request