mercurial for dummies (newbies), remote heads etc

[Uwe Brauer]

>>> "MK" == Marcin Kasperski <Marcin.Kasperski at mekk.waw.pl> writes:

   >> 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…).

On  a second thought: maybe I should tell them to add a bookmark to the
changeset they want to push, 

    1. they push,

    2. I pull, merge and push back

I honestly don't like bookmarks, but maybe this is a way avoid their confusion,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5673 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20200529/4c537df4/attachment.p7s>