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

   > I strongly doubt people who find merge difficult would find git easier.
Right I just checked for example

https://devconnected.com/how-to-push-git-branch-to-remote/

The error message is however better than the one provided by mercurial
it gives a hint.


My colleagues swear in Dropbox, the number manually either files or
directories, which is very cumbersome. However, I wonder how they avoid
conflicting errors. It sound that they following subversions idea.

I never used subversion, (I used RCS, a bit of CVS and then mercurial)

I had a quick look in subversion's manual, the branching model is just
terrible. Now idea why it is still widely used.

Uwe 
-------------- 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/5da60667/attachment.p7s>