Add automatic resolution of remote being ahead of local

[greyfiles]

When attempting to push to a remote repo that has moved ahead of your local repo, the output message is helpful but still requires subsequent commands to fix. Add functionality to automatically fix the issue by pulling and merging the remote into the local repo before re-attempting to push.