Working with Checkpoints and Tracks

Create architectural checkpoints (commits), manage parallel tracks (branches), analyse track divergence, and review Git command transparency logs.

February 23, 2026

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

Operation	Description
Create track	Start a new parallel line of work from the current point. Name tracks descriptively: "feature/payment-redesign", "migration/phase-2".
Switch track	Move to a different track. Your working tree updates to reflect that track's state.
List tracks	View all local and remote tracks with their last checkpoint summary.
Delete track	Remove a track that is no longer needed. Only deletes the local reference.
Track divergence	See how far two tracks have diverged: checkpoints ahead, checkpoints behind, and divergence point.

Reconciling Tracks

When work on a track is complete, reconcile it back into the main track:

Syncing with Remote

Operation	Direction	Description
Pull	Remote to Local	Download checkpoints from the remote and merge into the current track
Push	Local to Remote	Upload local checkpoints to the remote
Sync	Both	Pull then push in a single operation

Git Command Transparency

Every operation logs the equivalent Git CLI command in the application log. This enables:

Full Transparency

See exactly which Git commands NeoArc executed on your behalf. Nothing is hidden.

Troubleshooting

If something goes wrong, the command log provides the information needed to diagnose and fix the issue.

Learning Git

Team members unfamiliar with Git can see which commands correspond to each architectural operation.

Audit Compliance

The command log serves as an audit trail for environments requiring operational transparency.

Deep Git Integration

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.

Conflict Resolution for Architects

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.