From: ZheNing Hu <email@example.com> To: Christian Couder <firstname.lastname@example.org> Cc: Git List <email@example.com>, Junio C Hamano <firstname.lastname@example.org>, email@example.com, Elijah Newren <firstname.lastname@example.org> Subject: Re: Question about pre-merge and git merge octopus strategy Date: Sun, 8 May 2022 22:13:20 +0800 [thread overview] Message-ID: <CAOLTT8RscqL_05tg0cwBBQ50HmpsoqGYXpcWPTT9nzL2LueqxA@mail.gmail.com> (raw) In-Reply-To: <CAP8UFD2p+Evqv_MBAgv23zooppsNWjOw6ZU2GLqAq_skZoJPOw@mail.gmail.com> Christian Couder <email@example.com> 于2022年5月7日周六 01:24写道： > > Hi, > > On Fri, May 6, 2022 at 10:15 AM ZheNing Hu <firstname.lastname@example.org> wrote: > > > 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. > > Elijah (added in Cc) has been working on "git merge-tree" improvements > based on the new "ort" merge he developed. It supports merging 2 > branches, but maybe there are ways to make it support more than 2. > OK. As he said, there is not such option :( > > 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. > > Yeah, I think that's what you want. > > > 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? > > I don't know octopus merges much, but I think you should be able to > abort using "git reset" (maybe with "--hard"). If the merge was > performed using --no-commit or if there was a conflict, then I think > it should be expected that there is no MERGE_HEAD as no commit would > be created so MERGE_HEAD would have nothing to point to. Yes, git reset --hard HEAD is the way get out of merging conflicts. But why git merge --abort doesn't work? I think it may confuse users...
next prev parent reply other threads:[~2022-05-08 14:13 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-06 8:14 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 [this message] 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=CAOLTT8RscqL_05tg0cwBBQ50HmpsoqGYXpcWPTT9nzL2LueqxA@mail.gmail.com \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --subject='Re: Question about pre-merge and git merge octopus strategy' \ /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
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).