git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* Question about pre-merge and git merge octopus strategy
@ 2022-05-06  8:14 ZheNing Hu
  2022-05-06 17:23 ` Christian Couder
  2022-05-08 15:01 ` Carlo Marcelo Arenas Belón
  0 siblings, 2 replies; 15+ messages in thread
From: ZheNing Hu @ 2022-05-06  8:14 UTC (permalink / raw)
  To: Git List; +Cc: Junio C Hamano, Christian Couder, vascomalmeida

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

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2022-05-19 14:47 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-06  8:14 Question about pre-merge and git merge octopus strategy ZheNing Hu
2022-05-06 17:23 ` Christian Couder
2022-05-07  4:09   ` Elijah Newren
2022-05-07 18:37     ` Junio C Hamano
2022-05-08 14:44     ` ZheNing Hu
2022-05-10  7:07       ` Elijah Newren
2022-05-11 11:21         ` ZheNing Hu
2022-05-12 15:04           ` Elijah Newren
2022-05-12 15:39             ` Junio C Hamano
2022-05-13  5:15               ` Elijah Newren
2022-05-13 12:56                 ` Junio C Hamano
2022-05-19 13:15                 ` ZheNing Hu
2022-05-19 14:46                   ` Elijah Newren
2022-05-08 14:13   ` ZheNing Hu
2022-05-08 15:01 ` Carlo Marcelo Arenas Belón

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).