From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 01 May 2012 06:21:14 GMT
Subject: Re: Newbie grief
Message-ID: <7vvckgbew5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <08704bd2e32343a4b9def80e4fa1efa2-mfwitten@gmail.com>

Michael Witten <mfwitten@gmail.com> writes:

> Here's a start for a more precise discussion.

When does the "Cache server" updated from the "$uri_for_central_repo" in
this picture?  If it is after push by either from Machine A or B, somebody
needs to reconcile that and whatever A/B pushed.

And between Hg style "split head" or Git style refs/remotes/* namespaces
there is no difference to perform that reconcilation.  Somebody needs to
run "merge" on the "Cache server" and at some point the result needs to be
pushed to the $uri_for_central_repo back.

So...