chore: Update branch references and add Conductor file exclusion policy

This commit is contained in:
Yunxiao Xu
2026-02-16 16:58:16 -08:00
parent 6d72c6602c
commit 3881ca6fd8

View File

@@ -48,9 +48,9 @@ The frontend is a modern SPA (Single Page Application) designed for data-heavy i
- **LangChain Docs**: See the `langchain-docs/` folder for local LangChain and LangGraph documentation. - **LangChain Docs**: See the `langchain-docs/` folder for local LangChain and LangGraph documentation.
## Git Operations ## Git Operations
- All new feature and bug-fix branches must be created from the `conductor` branch except hot-fix. - All new feature and bug-fix branches must be created from the `develop` branch except hot-fix.
- The `conductor` branch serves as the primary development branch where integration occurs. - The `develop` branch serves as the primary development branch where integration occurs.
- The `main` branch is reserved for stable, production-ready code. - The `main` branch is reserved for stable, production-ready code.
- Merges from `conductor` to `main` should only occur when significant milestones are reached and stability is verified. - Merges from `develop` to `main` should only occur when significant milestones are reached and stability is verified.
- Conductor-specific configuration or meta-files should remain on the `conductor` branch or its derivatives and never be merged into the `main` branch. - **CRITICAL:** Conductor-specific configuration or meta-files (e.g., `conductor/` directory) must **NEVER** be tracked or committed to the repository. They are intended for local agent guidance and coordination only.
- Use rebase to keep commit history clean before merging feature branches back into `conductor`. - Use rebase to keep commit history clean before merging feature branches back into `develop`.