mercurial for dummies (newbies), remote heads etc

[Becker, Mischa J]

Back when I was first learning mercurial I found the Hg Init tutorial very clear & helpful in how it explained working with others and merges etc.  It's gone now but you can still see it in the Internet Archive if you're interested.
https://web.archive.org/web/20180926172759/http://hginit.com/

My only other suggestion, if your collaborators are willing, is to use TorgoiseHg instead of the command line.  I find it's interface and graphical log a lot easier to read & understand than hg log -G.   And it has a console window for when you still want to type commands or read hg help.

Mischa Becker

> -----Original Message-----
> From: Uwe Brauer
> Sent: Thursday, May 28, 2020 11:32 AM
> Subject: mercurial for dummies (newbies), remote heads etc
>
> Hi
>
> I would like to ask for advice.
>
> I do collaborate using mercurial but mostly with single users and that works
> reasonable well, even given that the other person does not really understand
> mercurial.
>
> Now because of coronovirus I have forced with six colleagues to collaborate
> and proposed mercurial.
>
> Well two problems/question occur
>
>     1. They did not take the time to learn the basic so they got
>        confused when some pushes got refused, because of remote
>        anonymous heads (I did not tell them the force option). I tried
>        to explain the merge command but it did not really work out,
>        maybe I should have told them about the fetch command, but if
>        there is a conflicting merge, thinks can get worse.
>
>        a. So I thought have having used named branches (one collaborator
>           one branch), and I do the merge, but sooner or later similar
>           problems occur.
>
>     2. What would you guys have proposed?
>
>     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?
>
> Thanks
>
> Uwe Brauer
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://nam05.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww
> .mercurial-
> scm.org%2Fmailman%2Flistinfo%2Fmercurial&data=02%7C01%7Cmisch
> a.becker%40kroger.com%7C80944cb127924c416e3608d80336fc9e%7C8331e
> 14a91344288bf5a5e2c8412f074%7C0%7C1%7C637262882000396652&s
> data=3KLuavABwIpIhQVULhSRax16JkVr6rp0ZTA87eR6N6Y%3D&reserve
> d=0

________________________________

This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message.