A merge commit landed on master, breaking the project's linear history requirement.
* 5fc5d7ecc Merge remote-tracking branch 'origin/develop' (HEAD → master)
|\
| * 1172ababb fix: rescue PaymentError and render error from Stripe (#5469)
Peter Berkenbosch peterberkenbosch
peterberkenbosch
/ fix-merge-commit-on-master.md
Created
March 29, 2026 12:10
Fixing a merge commit on master - restoring linear history