# Repo Conflict Resolution

The repo contains many milestone documents. This is intentional, but implementation must not follow conflicting instructions.

## Conflict categories

### Product conflict

Example: one document says GeoIntel is a dashboard, another says GeoIntel is a GeoAI Workbench.

Resolution: follow `GEOINTEL_CONSTITUTION.md`.

### Stack conflict

Example: one document suggests another backend framework.

Resolution: follow ADRs and `ARCHITECTURE_INVARIANTS.md`.

### Scope conflict

Example: one older document prioritizes reports before QA/QC.

Resolution: follow `PASS_SEQUENCE_FINAL.md` and `V1_SCOPE_FREEZE.md`.

### API conflict

Example: endpoint naming differs between older docs.

Resolution: follow `API_CONTRACTS.md`, `API_CONTRACT_FREEZE_M2.md`, and response envelope contracts.

### CRS/geospatial conflict

Resolution: follow `GIS_STANDARDS.md`, `CRS_POLICY.md`, and canonical geometry contracts.

## Rule

When implementing, newer canonical control docs are binding. Older milestone docs are explanatory only.