Ensure we pull the latest version of git + merge, before attempting to push back terraform managed state

[hexylena]

to avoid the situation where a merge mid-GHA run of terraform leaves it unable to be pushed