docs: add branch hygiene commit-and-merge guidance

This commit is contained in:
2026-03-08 21:43:07 +00:00
parent 62578e7aa5
commit 08c85afa5e
3 changed files with 7 additions and 1 deletions

View File

@@ -108,6 +108,10 @@ Run these commands in order:
- **AVOID**: Local Python development (pip install fails with network timeouts)
- **AVOID**: Trying to run backend outside Docker (requires complex GDAL/PostGIS setup)
### Branch Hygiene
- **ALWAYS** commit and merge completed feature branches promptly once validation passes.
- Do not leave finished work lingering in long-lived feature branches or worktrees.
### Expected Test Failures
- Frontend check: 3 errors and 19 warnings expected (accessibility and TypeScript issues)
- Backend tests: 2 out of 3 Django tests fail (API endpoint issues) - **DO NOT fix unrelated test failures**
@@ -178,4 +182,4 @@ docker compose down && docker compose up -d
- Backend source: `backend/server/`
- Static assets: `frontend/static/`
- Database: Handled by Docker PostgreSQL container
- Documentation: `documentation/` folder
- Documentation: `documentation/` folder

View File

@@ -64,3 +64,4 @@ Run in this order:
## Conventions
- Do **not** attempt to fix known test/configuration issues as part of feature work.
- Use `bun` for frontend commands, `uv` for local Python tooling where applicable.
- Commit and merge completed feature branches promptly once validation passes (avoid leaving finished work unmerged).

View File

@@ -72,3 +72,4 @@ Run in this exact order:
## Conventions
- Do **not** attempt to fix known test/configuration issues as part of feature work.
- Use `bun` for frontend commands, `uv` for local Python tooling where applicable.
- Commit and merge completed feature branches promptly once validation passes (avoid leaving finished work unmerged).