Re: Question about pre-merge and git merge octopus strategy

From: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Date: May 8, 2022, 15:01 UTC
Message-ID: <20220508150153.74dvhl5cgi7wu5a4@carlos-mbp-2.lan>
In-Reply-To: <CAOLTT8S8rh+VYcuaqBeNtmphiRqw7HropLFpkxfnTJq6BngGXw@mail.gmail.com>

On Fri, May 06, 2022 at 04:14:56PM +0800, ZheNing Hu 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`.

why not merge them and find that way if they have conflicts that are left unresolved, or are you also interested in conflicts that were solved by the merge?

if you only care about the unresolved conflicts then (unless this broke recently with ort) the following (untested) should work:

  $ git switch target
  $ git merge topic && echo "SHIP IT!" || git reset --hard ORIG_HEAD

obviously will need to be changed if you want to merge more than two branches but the principle is tme same.

Carlo