conductor-revert

Conductor Revert - Safely Revert Git Commits by Logical Work Unit

Overview

Conductor Revert is a Git-aware revert tool that supports rolling back code by Track (entire task), Phase (stage), or Task (individual task), so reverts align with your logical work units.

Use Cases

1. Implementation went down the wrong path and needs to be redone

When the implementation direction for a feature or task is wrong and needs a full redo, there’s no need to pick individual Git commits to revert. Simply specify the corresponding Track ID, Phase, or Task, and Conductor Revert will automatically identify all related commits and perform the reverts in the correct order.

2. Revert a specific phase in a multi-stage project

In phased development, you may only need to revert a particular phase (e.g., phase2) and its subsequent phases while keeping earlier completed work. Conductor Revert supports the {trackId}:phase{N} format to precisely control the revert scope.

3. Safe reverts that preserve full Git history

Unlike git reset --hard, Conductor Revert uses git revert to create new revert commits, preserving the full history. Even when commits have been pushed to a remote, you can safely perform reverts without force-pushing.

Core Features

1. Intelligent commit discovery and association

Conductor Revert scans the Git log and automatically finds all commits related to the specified work unit. It supports multiple commit message formats, including feature implementation commits and task-marking commits (e.g., "mark task 2.3 complete"), ensuring no related changes are missed.

2. Preview and confirmation before execution

Before performing any revert, Conductor Revert displays the full execution plan, including the list of commits to be reverted, affected files, and Plan.md state changes. The user must explicitly enter "YES" to proceed, preventing accidental operations.

3. Conflict-safe handling

If Git conflicts occur during the revert process, Conductor Revert will pause immediately and display conflict details, offering options for how to proceed. It will not attempt to auto-resolve conflicts, ensuring the user retains full control over every change.

Frequently Asked Questions

How is Conductor Revert different from a normal git revert?

A normal git revert requires you to specify each commit SHA manually and run them in the correct reverse order. Conductor Revert automatically finds all related commits based on Track/Phase/Task, reverts them in the correct order in bulk, and synchronizes updates to Conductor’s Plan.md and tracks.md state.

Can I safely revert after pushing to the remote?

Yes. Conductor Revert uses git revert to create new revert commits, which is the safest way to roll back in Git. After the reverts are complete, you only need to perform a normal git push — do not and should not use --force. The remote repository will show the new revert commits and preserve the full history.

What if I encounter conflicts during a revert?

Conductor Revert will stop immediately when conflicts are detected and display the conflicting files and options. You can choose to view conflict details, abort the remaining revert sequence (while keeping already completed reverts), or open a manual resolution guide. In any case, it will not try to auto-resolve conflicts, ensuring you maintain full control over the code.