% pwd /home/zfogg/src/hacktorial5 % git init
% touch index.coffee % git add index.coffee % git commit -m "Initial commit."
% echo $USER zfogg % git remote add origin email@example.com/$USER/hacktorial5 % git push -u origin master
% echo $USER someguy % git clone https://github.com/zfogg/hacktorial5
Two people are working on a project. Both are on the master branch, both are at the same commit.
One person changes a line in a file, the other person deletes the same line in the same file.
One person stages, commits, and pushes their changes. Of course this works just fine; a very standard task for Git.
Now, the second person tries to commit and push their changes.