Re: Different merges from translation perspective

From: Jacob Keller <jacob.keller@gmail.com>
Date: Jan 16, 2017, 06:00 UTC
Message-ID: <CA+P7+xqcU96siyNrjNF8Tze4Nbf3k-oJBZ2g8xeYLU92AX-0rQ@mail.gmail.com>
In-Reply-To: <CAP6f5MkOoDUqHCvLNQ+xJGWTbrdecet9W_JK5y7JeAnBpGeAaw@mail.gmail.com>

On Sun, Jan 15, 2017 at 8:41 PM, Alexander Shopov <ash@kambanaria.org> wrote:

Show 11 quoted lines

> Hi all,
> What is the difference between simple, fast forward, automatic and
> trivial merge?
> I am updating the translation and the only thing I am sure about is
> that these four are not octopus merges,
> Fast forward is when current state is ancestor of tip, automatic merge
> is when the merge algorithm is decided by git rather than developer.
> What about simple (git-merge-octopus.sh) and trivial
> (builtin/merge.c)?
> Kind regards:
> al_shopov

Hi,

I'm not sure exactly what the documentation says regarding all of these things.

I know for sure that a fast-forward merge isn't "really" a merge in the sense that no merge-commit is generated. Instead, the current branch is simply fast-forwarded to the new result (since it's a direct ancestor of the new tip.

I don't really have any answers for the others.

Thanks, Jake