Git

This is a comprehensive Git workflow guide built around Conventional Commits and GitHub Flow. It covers commit message formatting (feat, fix, docs, etc.), branch naming conventions, PR merge strategies (squash vs merge vs rebase), and interactive rebase for cleaning up history. The guide uses git switch and git restore instead of the older checkout syntax, which is the right call since those commands are clearer about intent. Heavy on practical examples and comparison tables. If you're working with Claude on a codebase and want it to follow consistent Git practices rather than making up its own conventions, this gives it a solid playbook. The conflict resolution section is straightforward, and the command reference at the end is handy for quick lookups.