--- description: Project workflow rules, GitHub flow, and TODO.md tracking. alwaysOn: true always_on: true glob: "*" --- ## Branching & Conflict Resolution Strategy (GitHub Flow) This project strictly follows the **GitHub Flow**. All development happens in short-lived feature branches branched off from `main`. Direct commits to `main` are prohibited. ### 1. Development Workflow 1. **Branch Creation:** Create a descriptive branch from the latest `main` state: `git checkout main && git pull && git checkout -b feature/your-feature-name` 2. **Atomic Commits:** Make small, logical, and self-contained commits. 3. **Push & Pull Request:** Push the branch and open a Pull Request (PR) against `main` for review. ### 2. Merge Conflict Policy When multiple features are developed simultaneously, `main` might advance before your PR is merged, causing a merge conflict. **The author of the pending PR is solely responsible for resolving conflicts.** #### Resolution Procedure: Never force-push blindly or overwrite other developers' work without understanding it. Follow these exact steps to resolve a conflict: 1. **Fetch Latest Main:** Update your local repository's main branch: ```bash git checkout main git pull origin main ### 3. Documentation Update .md Files die nichts an der Integrität oder Impact der Codebase beiwirken sollen als einfacher Commit in Main behandelt werden. ## Project Management - The Current Development Progress is tracked and marked down and always updated in the File `TODO.md` ## Knowledge Management - Every time you learn something new or worth mentioning about the project (e.g., architecture details, aesthetic conventions, logic workflows), you MUST document it. - If it is not already recorded in the project's brain file, you must add it to `@[.agents/brain.md]`.