First thing you usually see is a message like this when you try and push
:
TBrown02@LZ2626XTBROWN02 MINGW64 /r/conflictdemo2 (master)
$ git push
To https://github.com/tbnorth/conflictdemo.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/tbnorth/conflictdemo.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing