You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Resolve Git merge conflicts entirely inside Dev Command Center, without
leaving the workbench for a browser or external editor.
Configure versioned project automation for workspace setup, manual fixes,
and safety checks before completing merges or pushing changes.
Keep the conflict workflow focused and responsive with friendly workspace
labels, localized timestamps, and a dedicated full-width resolution surface.
Built-In Git Conflict Resolution
Added a structured conflict resolver backed by the Git index instead of
parsing conflict markers as the source of truth.
Added per-hunk and whole-file actions to accept the current branch, accept
the incoming branch, or accept both sides in a deterministic order.
Added an editable result surface, support for modify/delete conflicts, and
safe handling for binary, oversized, and non-UTF-8 files.
Added a reviewable agent-assisted resolution flow. Agent suggestions are
applied only to the editor buffer and never staged or committed silently.
Added merge abort, final validation, merge commit, and push as one coherent
in-app workflow.
Project Automation
Added .dcc.toml tasks with check and fix modes, optional relative
working directories, and per-task timeouts.
Added optional before_merge and before_push hooks. Fix tasks remain
manual-only and cannot run automatically.
Preserved workspace setup behavior and backward compatibility with the
existing scripts.validate configuration.
Added a project automation editor under Settings > Git with full command
output, exit codes, durations, and clear Git-tracking status.
Project automation runs only for explicit actions; no background polling or
periodic command execution was introduced.
Safety And Localization
Added configuration hashing and workspace fingerprints to stop merge or push
completion when commands, tracked files, or the Git index change during
validation.
Added path confinement for task working directories and compare-and-swap
protection for conflict edits.
Added complete Portuguese and English localization for the conflict and
automation experiences.
Fixed composer message timestamps so relative time follows the active DCC
language instead of always falling back to English.
Validation Before Publishing
Run desktop type checks: yarn workspace @dcc/desktop typecheck
Run the complete desktop test suite: yarn workspace @dcc/desktop test
Build the production desktop frontend: yarn workspace @dcc/desktop build
Check the Tauri crate: cargo check --manifest-path src-tauri/Cargo.toml
Confirm release metadata is 0.1.23 in package.json, sidecar/package.json, sidecar/src/index.mjs, src-tauri/Cargo.toml, and src-tauri/tauri.conf.json.