Git Error Path Is Unmerged