[Dropbox without pushes]

Uwe Brauer oub at mat.ucm.es
Sun May 31 18:33:31 UTC 2020


>>> "cm" == cesar mena <cesar.mena at gmail.com> writes:

   > :)

   >> The point is, and I think this is a general phenomena, people in a
   >> collaboration think they are working strictly sequential, while in fact
   >> they don't. Because if they worked sequential, then there would be no
   >> anonymous heads.
   >> 
   >> 
   >> Mercurial just displays an underlining merging problem, which I am
   >> afraid a lot of people have difficulties to gasp.
   >> 
   >> And that is why I think all these dropbox solutions have un noticed
   >> merging problems

   > what about having your colleagues always push with -f (hg push -f), and
   > then the onus is on you to resolve all merges?

I know that would be the method of last resort. That might be soon
become quite messy. 
An alternative would be

 hg book colleague1
 hg push -B collegue1

I have to think about it. I will try to make them aware of the merging
problem, as a pure logical one.
-------------- 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/20200531/5c3c64b8/attachment.p7s>


More information about the Mercurial mailing list