# Git Workflow Guide ## Overview This guide outlines our Git workflow for managing cognitive modeling projects, integrating with both [[cursor_integration]] and [[obsidian_usage]]. ## Repository Structure ### Core Branches - `main` - Stable production code - `develop` - Integration branch - `feature/*` - Feature branches - `release/*` - Release preparation - `hotfix/*` - Production fixes ## Workflow Patterns ### Feature Development 1. Create feature branch from `develop`: ```bash git checkout develop git pull origin develop git checkout -b feature/new-feature ``` 2. Develop with [[cursor_integration]]: - Use AI assistance - Follow [[code_style]] - Update [[documentation_guide]] 3. Commit changes: ```bash git add . git commit -m "feat: add new feature - Added X functionality - Updated Y components - Related to #issue" ``` ### Knowledge Base Changes #### Working with Obsidian 1. Create knowledge branch: ```bash git checkout -b kb/topic-name ``` 2. Update content: - Follow [[obsidian_usage]] guidelines - Maintain [[linking_patterns]] - Update [[node_types]] 3. Commit changes: ```bash git add knowledge_base/ git commit -m "kb: update topic structure - Added new nodes - Updated relationships - Fixed broken links" ``` ## Commit Conventions ### Message Structure ``` ():