This commit fixes issue #1338 by removing duplicate content blocks that were appearing 3-4 times on the page. Changes: 1. README.md: - Removed duplicate "Branch Protection & Review Policy" section (lines 121-134) - Removed duplicate "Running Locally" section (lines 149-167) - Kept the detailed "Branch Protection & Review Policy" section at the top - Kept the first "Running Locally" section with all content 2. POLICY.md: - Consolidated duplicate content into single cohesive policy - Merged two "Branch Protection Rules" sections - Merged two "Default Reviewer" sections - Merged two "Acceptance Criteria" sections - Added "Enforcement" and "Notes" sections from second half The duplicate content was likely caused by a bad merge or template duplication. This cleanup ensures each section appears only once while preserving all content. Closes #1338
2.1 KiB
2.1 KiB
Branch Protection & Review Policy
🛡️ Enforced Branch Protection Rules
All repositories must apply the following branch protection rules to the main branch:
| Rule | Setting | Rationale |
|---|---|---|
| Require PR for merge | ✅ Required | Prevent direct pushes to main |
| Required approvals | ✅ 1 approval | Ensure at least one reviewer approve before merge |
| Dismiss stale approvals | ✅ Auto-dismiss | Require re-approval after new commits |
| Require CI to pass | ✅ Where CI exist | Prevent merging of failing builds |
| Block force push | ✅ Enabled | Protect commit history |
| Block branch deletion | ✅ Enabled | Prevent accidental deletion of main |
⚠️ Note: CI enforcement is optional for repositories where CI is not yet configured.
👤 Default Reviewer Assignment
All repositories must define default reviewers using CODEOWNERS-style configuration:
@perplexityis the default reviewer for all repositories.@Timmyis a required reviewer forhermes-agent.- Repository-specific owners may be added for specialized areas.
📋 Affected Repositories
| Repository | Status | Notes |
|---|---|---|
hermes-agent |
✅ Protected | CI is active |
the-nexus |
✅ Protected | CI is pending |
timmy-home |
✅ Protected | No CI |
timmy-config |
✅ Protected | Limited CI |
✅ Acceptance Criteria
- Branch protection enabled on
hermes-agentmain - Branch protection enabled on
the-nexusmain - Branch protection enabled on
timmy-homemain - Branch protection enabled on
timmy-configmain @perplexityset as default reviewer org-wide- Policy documented in this file
🚧 Enforcement
- All repositories must have these rules applied in the Gitea UI under Settings > Branches > Branch Protection.
- CI must be configured and enforced for repositories with CI pipelines.
- Reviewers assignments must be set via CODEOWNERS or manually in the UI.
🧠 Notes
- For repositories without CI, the "Require CI to Pass" rule is optional.
- This policy is versioned and must be updated as needed.