Fix post-merge hook to show actual error messages

Browse Source

Previously the hook redirected stderr to /dev/null, hiding useful error
messages like 'Git conflict markers detected'. Users only saw a generic
warning with no indication of the root cause.

Now captures and displays the actual error output, making it immediately
clear what went wrong (e.g., merge conflicts in JSONL).

Fixes bd-nszi

Amp-Thread-ID: https://ampcode.com/threads/T-6231e968-2c06-44ad-855d-bb5fafe452f6
Co-authored-by: Amp <amp@ampcode.com>

...

This commit is contained in:

Steve Yegge

2025-11-08 02:45:51 -08:00

parent 27fd6e4287

commit abb1d1c714

3 changed files with 362 additions and 243 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

591

.beads/beads.jsonl

File diff suppressed because one or more lines are too long