I had this problem too until I forced myself to use the `gcm` alias from oh-my-zsh’s Git plugin. IIRC it checks out to master if it exists, else main. It has almost entirely removed this distinction from my life.