Add pre-commit hook to check for merge conflicts#17279

Merged

AlexWaygood merged 1 commit intoastral-sh:mainfrom

Skylion007:skylion007/add-merge-conflict-check-2025-04-07

Apr 10, 2025

Commits on Apr 7, 2025

Add pre-commit hook to check for merge conflicts
Skylion007
committed

⚡