From: Abhijeet Sonar <abhijeet.nkt@gmail.com>
Date: Thu, 24 Oct 2024 07:59:21 GMT
Subject: [QUESTION] Can I merge --continue with --no-verify
Message-ID: <7038bb3a-2aad-4bde-bd46-f2bd2ef659d1@gmail.com>

I recently found myself wanting to continue a merge after resolving
conflicts without having the pre-commit hook run:

git merge --continue --no-verify

this fails and prints usage.

Digging the source, I can see that in builtin/merge.c:1378 we do:

    if (continue_current_merge) {
        [...]

        if (orig_argc != 2)
            usage_msg_opt(_("--continue expects no arguments"),   
                  builtin_merge_usage, builtin_merge_options);

I see why we would want this - the --continue flag makes the merge command
perform an operation that is very different than what merge normally does
without this option and therefore the usual options do not apply.
However, I think
it does make sense to allow --no-verify - it feels very intuitive to use
it when
bypassing the pre-commit hook is desired while continuing a merge.

Thanks