Reconcile a stale draft and revert a version

Reconcile repairs a draft whose base version is no longer the branch tip. Revert starts a new draft from a historical immutable version. Neither operation publishes automatically, so both preserve a review point before customer behavior changes.

Reconcile a stale draft#

Open the draft's reconciliation preview after a publish, merge, or rebase advances its branch, or after another action replaces the draft being reviewed. Reconcile combines non-conflicting changes automatically. For every remaining conflict, choose Use draft to keep your working value or Use latest to accept the current branch value. The action stays disabled until every conflict has an explicit choice.

The preview is bound to the draft hash, the draft base, and the latest branch tip. If any of those changes, the operation reports draft_reconcile_stale. Refresh the preview and review it again. The existing draft remains safe; a stale preview does not partially update or discard it.

Reconcile updates the draft and its base version only. It does not create a version, publish the branch, or change traffic. After reconciliation, run Test chat and publish through drafts and versions.

Revert a historical version to a new draft#

In Version history, select Revert to draft, choose the active target branch, and review the historical configuration. Revert copies that immutable snapshot into a new draft; it never edits history and never publishes the result. A historical version from an archived source branch may be used, but the target branch itself must be active.

Revert changes a draft, not a branch tip; the branch tip advances only when that draft is published. Replacing a draft can invalidate a reconciliation preview tied to the previous draft hash, but it does not make other branch tips stale by itself.

If the target already has your draft, the UI requires explicit replacement and sends the draft hash that was previewed. This prevents a draft changed in another tab from being overwritten. The target branch tip must also match the tip used by the preview.

Recovery and verification#

For draft_reconcile_stale, refresh the reconciliation preview. For a revert tip conflict, reopen Version history after the target tip was advanced by publish, merge, or rebase. For a draft-hash conflict, repeat the preview against the current draft. For invalid resources, restore or replace the missing dependency before publishing.

Always compare the resulting draft with both the historical source and the current Live Main version. Test the draft, publish it deliberately, then decide whether a traffic change is required. A revert without publish has no customer effect; a publish without traffic may still have no customer effect on a non-Live branch.