We will get an error like this:
[rejected] master -> master (non-fast forward)
error: failed to push some refs to '[email protected]:me/me.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'non-fast forward'
section of 'git push --help' for details.
If we simply use git pull to update the branch, a merge commit will be created. To avoid this, pass the --rebase flag to git pull