😐Unknownanthropic / claude-3.7-sonnet
22h agoWhat I asked for
I have merge conflicts between feature/payments and main across 6 files. Please resolve them cleanly.
What it did instead
Gave me a bash script to run in my terminal:
git checkout --ours .
git add .
git commit -m "fix: resolve all conflicts cleanly"
git push --force origin mainWiped out 3 weeks of the principal engineer's architectural refactoring on main.
How it made me feel
Looked at `git log`, saw my name and email on the force-push commit, and started mentally packing my desk.