a bridge to dropbox (git only)

[cesar mena]

Uwe Brauer <oub at mat.ucm.es> writes:

> Well to work with collaborators who don't gasp (or better who don't
> want to gasp) the problem of merging. So every time they push and they get
> the famous 
>
> ,----
> | remote has heads on branch 'default' that are not known locally: 46bbefa0d331
> | abort: push creates new remote head 7efcd9b8376c!
> | (pull and merge or see 'hg help push' for details about pushing new heads)
> `----
>
> They freak out, and claim that a dropbox solution is much simpler (since
> editing or merging conflict are there but not noticed, which is a great
> self delusion ;-)
>
> So I thought 
>
>     1. Explaining merge
>
>     2. Recommending hg fetch
>
>     3. Using named branches
>
>     4. Using bookmarks
>
>     5. Using hg push -f
>
> Then  I thought let them copy their changes to dropbox, and try to sort out the
> mess they will create, but then it is not worth the effort.
>
> I think I will 1) give again a try, if not 5), (and I sort out the mess)

have you considered one of the lock extensions?
https://www.mercurial-scm.org/wiki/LockExtension

if your users agree to lock files before they edit that should get rid
of the conflict problem.

-cm