Add aliases to your gitconfig. Not gonna solve the frustration but at least it doesn’t have to be a trigger (oops). Also, I much prefer trunk over main/master anyway so I just went back to that.