Git Merge Policy

Git Merge Process Breakdown for Headless Hostman

1. Customer Projects (Auto-Merge to Production)

This process applies to customer-managed sites or projects using Headless Hostman where instant deploys are expected.

Default Flow

• Push directly to production (e.g., main or live branch).
• Auto-merge and auto-deploy without manual intervention.

Compliance Notes

• All commits must be linked to a project/ticket and have identifiable authorship via Git identity or SSO.
• All pushes are logged in Git with commit SHA and timestamp.
• CI checks (if configured by the customer) are triggered on push.
• Immediate deployment with deployment logs retained.

Optional: Customer-Requested Review Mode

• Customers may request protected branches (e.g., release) and pull request reviews.
• Enables merge approvals, required reviewers, and delayed deployment through merge queues.

2. Headless Hostman Core Technology (Internal Tech Stack)

This process applies to the infrastructure, tools, and platform logic built and maintained by the Headless Hostman team. It follows SOC 2 / ISO 27001-compliant workflows.

Controlled Development Flow

1. Feature Branches: Work is performed on branches tied to Jira or task IDs.
2. CI/CD Enforcement: All pushes run tests, code quality checks, and security scans.
3. Pull Request Creation: PRs include task links, descriptions, and changelog updates if needed.
4. Peer Review: Minimum 2 reviewers not involved in development. Reviews are timestamped and logged.
5. Merge & Deploy: Merges occur via web UI only. Deployment occurs only after successful checks and approval. Deployment logs are retained for audit purposes.

Summary Table