Jens
faeb58ef6d
GeoIntel release gates / Compile, test, contracts and builds (push) Successful in 1m49s
GeoIntel release gates / Python and npm vulnerability policy (push) Successful in 21s
GeoIntel release gates / Production AI image, SBOM and container scan (push) Successful in 5m39s
GeoIntel release gates / Deploy exact gated revision to Unraid (push) Failing after 58m43s
38 lines
1.0 KiB
Markdown
38 lines
1.0 KiB
Markdown
# 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.
|