Uh oh, grooming git history locally and remote can be a headache. Have a seat.