A resolution is coming to the Giants’ quagmire involving Harrison Bader, a motorized scooter, a fire truck and an after-midnight crash that resulted in a broken foot.