threads / bug / 60156

Bug report

Subject: Bug report

## tl;dr

One message between Aug 28, 2023 and Aug 28, 2023.

replies: 0people: 1as markdown or json

Dexter Pontañeles· Aug 28, 2023, 12:51 UTC · lore

Thank you for filling out a Git bug report! Please answer the following questions to help us understand your issue.

What did you do before the bug happened? (Steps to reproduce your issue) I was trying to merge another branch to my branch but then got conflicts. After resolving the conflicts, I wanted to continue the merge operation but a hook was failing. I wanted to bypass this hook by adding --no-verify flag: git merge --continue --no-verify

What did you expect to happen? (Expected behavior) I expected the merge operation to continue, bypassing the hook

What happened instead? (Actual behavior) git command failed with error `fatal: --continue expects no arguments`

What's different between what you expected and what actually happened? The operation failed instead of proceeding with the git merge operation

Anything else you want to add:

Please review the rest of the bug report below. You can delete any lines you don't wish to share.

[System Info] git version: git version 2.42.0 cpu: arm64 no commit associated with this build sizeof-long: 8 sizeof-size_t: 8 shell-path: /bin/sh feature: fsmonitor--daemon uname: Darwin 22.6.0 Darwin Kernel Version 22.6.0: Wed Jul 5 22:22:05 PDT 2023; root:xnu-8796.141.3~6/RELEASE_ARM64_T6000 arm64 compiler info: clang: 14.0.3 (clang-1403.0.22.14.1) libc info: no libc information available $SHELL (typically, interactive shell): /bin/zsh

[Enabled Hooks]

← back to recent threads