clean up some `git-conflicting` aliases

no need to have the “.sh” suffix versions laying around
fix `gcd` command

apparently I broke it for remote repos when I was testing it on local
repos
fix / add conflicting ours/theirs checkout helpers
fix remote-copy-repo regression

and add comment