docs: add branch hygiene commit-and-merge guidance
This commit is contained in:
6
.github/copilot-instructions.md
vendored
6
.github/copilot-instructions.md
vendored
@@ -108,6 +108,10 @@ Run these commands in order:
|
|||||||
- **AVOID**: Local Python development (pip install fails with network timeouts)
|
- **AVOID**: Local Python development (pip install fails with network timeouts)
|
||||||
- **AVOID**: Trying to run backend outside Docker (requires complex GDAL/PostGIS setup)
|
- **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
|
### Expected Test Failures
|
||||||
- Frontend check: 3 errors and 19 warnings expected (accessibility and TypeScript issues)
|
- 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**
|
- 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/`
|
- Backend source: `backend/server/`
|
||||||
- Static assets: `frontend/static/`
|
- Static assets: `frontend/static/`
|
||||||
- Database: Handled by Docker PostgreSQL container
|
- Database: Handled by Docker PostgreSQL container
|
||||||
- Documentation: `documentation/` folder
|
- Documentation: `documentation/` folder
|
||||||
|
|||||||
@@ -64,3 +64,4 @@ Run in this order:
|
|||||||
## Conventions
|
## Conventions
|
||||||
- Do **not** attempt to fix known test/configuration issues as part of feature work.
|
- 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.
|
- 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).
|
||||||
|
|||||||
@@ -72,3 +72,4 @@ Run in this exact order:
|
|||||||
## Conventions
|
## Conventions
|
||||||
- Do **not** attempt to fix known test/configuration issues as part of feature work.
|
- 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.
|
- 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).
|
||||||
|
|||||||
Reference in New Issue
Block a user