mercurial for dummies (newbies), remote heads etc

[Marcin Kasperski]

>     2. What would you guys have proposed?

Teach them merge. But actually make them do it a few times, so they are
no longer afraid. And make sure they have kdiff3 installed and
configured as default merge tool. 

>     3. I wonder how git deals with this situation, you want to push, but
>        there is already a commit (so in mercurial you would pull and
>        merge) does git do this automatically?

In git you must make named branch before commiting. Plus it tries to
rebase when you pull (sometimes with sad effects…).

I strongly doubt people who find merge difficult would find git easier.