betterer
betterer copied to clipboard
phenomnomnominal
automerge not working - No such file or directory
Describe the bug
My apologies if I'm missing something obvious here, but after setting up two branches with .betterer.results changes, and trying to merge one into the other (after betterer init --automerge applied), I'm seeing this error:
git merge NOTICK-BettererAutoMerge-ResultsTest
/Users/***/***/node_modules/.pnpm/@[email protected]_@[email protected]_@[email protected][email protected]/node_modules/@betterer/cli/bin/betterer-merge .merge_file_WtMv9J .merge_file_2hQC77: /Users/***/***/node_modules/.pnpm/@[email protected]_@[email protected]_@[email protected][email protected]/node_modules/@betterer/cli/bin/betterer-merge: No such file or directory
Auto-merging .betterer.results
CONFLICT (content): Merge conflict in .betterer.results
Automatic merge failed; fix conflicts and then commit the result.
.gitattributes entry:
# Betterer merge
.betterer.results merge=betterer
Versions (please complete the following information):
- OS:
OSX Sequoia 15.4.1 - Betterer Version
5.4.0 - Node Version
20.11.1
After some more investigation, it appears the betterer-merge binary is missing
Updating the .git/config entry to use betterer merge instead of betterer-merge seemed to work
@phenomnomnominal I think I got a fix ^
LMK if that's something you'd be willing to merge