A Digital Consulting Plus methodology
English
← Full mapCurated public summary
Index
Handbook
01DCP Flow: what it is and why it exists02How DCP Flow works03How to start a project04Kai and working with AI agents04AKai operational capabilities05Institutional Prompt Cookbook06Solution Discovery explained for humans07Architecture, stack, and technology ecosystem07ATool & MCP Registry07BHostinger MCP for DCP websites and hosting08Quality Gates, QA, security, and evidence08AQuality profiles and testing strategy09Git, branches, PRs, and multi-agent work10Deploy, release, support, and operational evolution10AContainer First and standardized host operations10BPractical Container First demo11How DCP Flow evolves12Real cases and lessons learned13How to teach DCP Flow14Practical DCP Flow use cases15End-to-end playbooks: Web and Laravel
Entry 0962%
62%13 / 21
Entry 09PUBLIC HANDBOOK

Git, branches, PRs, and multi-agent work

main/dev/working branch, PR/diff, Pre-Merge Audit, technical/logical protection, concurrency contracts, shared interfaces, Break-Glass, and Merge Authority.

Source & authority

Public explanation

PUBLIC HANDBOOK
Based on
Human Handbook 09 — Git, branches, PRs, and multi-agent work
Related normative sources
  • NORMATIVE SOURCEStandard · Repository Governance
  • NORMATIVE SOURCEStandard · GitHub Repository Controls
Authority
Public explanation — NON-NORMATIVE
Summary

main/dev/working branch, PR/diff, Pre-Merge Audit, technical/logical protection, concurrency contracts, shared interfaces, Break-Glass, and Merge Authority.

Git is part of the durable work contract. DCP Flow uses branches, PRs, and evidence to coordinate humans and agents without relying on session memory.

Repository governance

The main / dev / working branch model separates production, integration, and bounded work. Pre-Merge Audit, Merge Authority, Technical Protection, and Logical Protection make integration reviewable.

Key points
  • main, dev, and working branches.
  • PR and diff as review surface.
  • Pre-Merge Audit.
  • Merge Authority and Break-Glass.

Multi-agent work

Concurrency Contracts, Shared Interfaces, and Integration Order reduce collisions. DCP Flow distinguishes Git Conflict from Functional Conflict: a clean merge does not prove two changes work together.

Key points
  • Temporal ownership.
  • Shared Interfaces.
  • Integration Order.
  • Git Conflict ≠ Functional Conflict.

Git turns temporary work into reconstructable technical state

DCP Flow uses main as the stable/release baseline, dev as the permanent integration baseline, and working branches as temporary work units. A PR exposes source, destination, commits, diff, checks, and discussion. Before a working branch integrates into dev, Pre-Merge Audit reviews scope, architecture, tests, security, documentation, Quality Gates, conflicts, and risk.

Key points
  • main = stable/release.
  • dev = integration baseline.
  • working branch = bounded work unit.
  • PR created ≠ merge authorized.

Logical Protection preserves the rule when the platform cannot enforce it

Branch Protection or Rulesets are preferable when available, but their absence does not remove governance. Logical Protection preserves no direct development on permanent branches, no force push, audit before merge, dev as the normal source of main, and Human Gate for release. Agents must treat these procedural controls as real constraints.

Key points
  • Platform cannot enforce ≠ rule does not exist.
  • No force push on main/dev.
  • Working branch → dev first.
  • CAN MERGE ≠ AUTHORIZED TO MERGE NOW.

Multi-agent work needs a Concurrency Contract and functional integration

Two agents can advance in parallel when temporal ownership, branches, modules, shared interfaces, dependencies, and Integration Order are clear enough. A Git Conflict is textual; a Functional Conflict may break the system even when the merge is clean. Material integrations may also require Post-Merge Validation on the actual resulting SHA.

Key points
  • Temporal ownership reduces overlap.
  • Shared Interfaces increase coordination risk.
  • Git Conflict ≠ Functional Conflict.
  • Post-Merge Validation verifies the real integrated state.
Contextual glossary＋
Working Branch

Working Branch

Pre-Merge Audit

Pre-integration review for conflicts, regressions, known debt, and missing evidence.

Concurrency Contract

Concurrency Contract

Merge Authority

Merge Authority