From: ZheNing Hu <adlternative@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Christian Couder <christian.couder@gmail.com>,
vascomalmeida@sapo.pt
Subject: Question about pre-merge and git merge octopus strategy
Date: Fri, 6 May 2022 16:14:56 +0800 [thread overview]
Message-ID: <CAOLTT8S8rh+VYcuaqBeNtmphiRqw7HropLFpkxfnTJq6BngGXw@mail.gmail.com> (raw)
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 reply other threads:[~2022-05-06 8:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-06 8:14 ZheNing Hu [this message]
2022-05-06 17:23 ` Question about pre-merge and git merge octopus strategy 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOLTT8S8rh+VYcuaqBeNtmphiRqw7HropLFpkxfnTJq6BngGXw@mail.gmail.com \
--to=adlternative@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=vascomalmeida@sapo.pt \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).