File conflicts are now decided one by one
When a delivery meets a file that was changed on the server, Conn2Flow records the conflict and lets you decide, file by file, from the panel, the API or the CLI.
Every live installation ends up with files that differ from what a delivery brings: someone fixed a template on the server, a project overrode a core file. Before, the delivery either ran over them or stopped. Now the conflict is recorded and waits for a decision.
The decisions
For each file in conflict you can overwrite with the new version, keep the one in production, or merge both. Keep becomes a rule: while the file on disk stays the same as when you decided, the next delivery arrives already resolved.
Three doors, one engine
- Panel: the conflict detail shows both versions and a merge editor.
- API:
/_api/project/conflictslists and details;/_api/project/resolveapplies the decision, under the deploy lock. - CLI:
c2f update:conflictsdownloads the versions and opens the comparison;c2f update:resolveapplies.
The same engine is used when recovering files from the server back to the repository. Declarative data removal came along: what the project stopped declaring can be removed from the database explicitly.
Status
Validated on an isolated tenant through the three paths; final acceptance pending.
Source: Core · req-199 · BATCH-205 to BATCH-207