Working with Checkpoints and Tracks
Create architectural checkpoints (commits), manage parallel tracks (branches), analyse track divergence, and review Git command transparency logs.
NeoArc uses architecture-first terminology for Git operations. A checkpoint is a saved snapshot of your architectural work (a Git commit). A track is a parallel line of architectural evolution (a Git branch). This guide covers the day-to-day workflow of creating checkpoints and managing tracks.
Creating a Checkpoint
Managing Tracks
Reconciling Tracks
When work on a track is complete, reconcile it back into the main track:
Syncing with Remote
Git Command Transparency
Every operation logs the equivalent Git CLI command in the application log. This enables:
NeoArc wraps Git with architecture-first concepts: checkpoints instead of commits, tracks instead of branches, baselines instead of tags. Semantic diff, conflict resolution, drift analytics, and shelving provide a complete governance workflow.
When merge conflicts occur, NeoArc presents them as architectural choices rather than raw JSON diffs. A three-way merge GUI with Accept Yours and Accept Theirs buttons makes conflict resolution meaningful.