tests careful update before commit

suspecting this caused problems when upstream had changes, but we'll see; this makes the diagnostic output make more sense, plus it just makes more sense to do it in this order in general (like, why would i want to commit before i am sure there are no merge problems coming from upstream?).