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

Question about pre-merge and git merge octopus strategy

From
ZheNing Hu <adlternative@gmail.com>
Date
May 6, 2022, 08:14 UTC
Message-ID
<CAOLTT8S8rh+VYcuaqBeNtmphiRqw7HropLFpkxfnTJq6BngGXw@mail.gmail.com>
Hi,

I am thinking about if git can "pre-merge" multiple branches, which can check if merge will have conflict, but not to merge them actually, like a option `--intend`.

I find "git merge-tree" can output merge result in stdout, which meets my needs, but it can only support two branches' merge.

So I find git merge with more than two branches can use octopus strategy. What about git merge --no-commit? Which will not commit automatically, so we can check if they have confilct, and abort merge.

I think it's not useful for git merge-octopus, because if we meet a merge conflict, we can't find MERGE_HEAD at all! How can we abort this conflict merge?

-- ZheNing Hu

Next: Christian Couder
Message 1 of 15 in “Question about pre-merge and git merge octopus strategy”
  1. ZheNing HuMay 6, 2022
  2. Christian CouderMay 6, 2022
  3. Elijah NewrenMay 7, 2022
  4. Junio C HamanoMay 7, 2022
  5. ZheNing HuMay 8, 2022
  6. Elijah NewrenMay 10, 2022
  7. ZheNing HuMay 11, 2022
  8. Elijah NewrenMay 12, 2022
  9. Junio C HamanoMay 12, 2022
  10. Elijah NewrenMay 13, 2022
  11. Junio C HamanoMay 13, 2022
  12. ZheNing HuMay 19, 2022
  13. Elijah NewrenMay 19, 2022
  14. ZheNing HuMay 8, 2022
  15. Carlo Marcelo Arenas BelónMay 8, 2022

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.