make git barge over any changes