recovering from git hell