From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Dec 2015 23:39:59 GMT
Subject: Re: [PATCH V5 2/2] user-manual: add section documenting shallow clones
Message-ID: <xmqq8u4cg6y8.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <xmqqd1tog88a.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

> Thanks for working on this.  Perhaps the last paragraph can be like
> this?
>
>     Merging inside a <<def_shallow_clone,shallow clone>> will work
>     as long as a merge base is found in the resent history.
>     Otherwise, it will be like merging unrelated histories and may
>     have to result in huge conflicts.  This limitation may make such
>     a repository unsuitable to be used in merge based workflows.

I forgot to say this, but "a" merge base above is very much
deliberate.  There can be (and indeed are in real life projects)
multiple merge bases between two commits being merged, and an
automatic merge wouldn't "be like merging unrelated histories" as
long as one of them exists in the shallowed history.