From 08c85afa5e9d0eabb0c868e39c97c27153772550 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 8 Mar 2026 21:43:07 +0000 Subject: [PATCH] docs: add branch hygiene commit-and-merge guidance --- .github/copilot-instructions.md | 6 +++++- AGENTS.md | 1 + CLAUDE.md | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index f3a77521..2b79979d 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -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 \ No newline at end of file +- Documentation: `documentation/` folder diff --git a/AGENTS.md b/AGENTS.md index 447235bc..8ca20a32 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -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). diff --git a/CLAUDE.md b/CLAUDE.md index 5b5412d2..3547e6dd 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -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).