git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Different merges from translation perspective

From
Alexander Shopov <ash@kambanaria.org>
Date
Jan 16, 2017, 04:41 UTC
Message-ID
<CAP6f5MkOoDUqHCvLNQ+xJGWTbrdecet9W_JK5y7JeAnBpGeAaw@mail.gmail.com>

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

Next: Jacob Keller
Message 1 of 3 in “Different merges from translation perspective”
  1. Alexander ShopovJan 16, 2017
  2. Jacob KellerJan 16, 2017
  3. Junio C HamanoJan 16, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.