Guides/Conflict Resolution in Practice

Conflict Resolution in Practice

Choose skip, overwrite, merge, or prompt based on ownership and risk.
Updated 5 June 2026·Task guide

Outcome

Conflicts are resolved intentionally instead of accidentally replacing target-site work.

Video walkthrough

Video walkthrough coming soon.

The YouTube embed will appear here.
Risk level

High. Wrong conflict choice can replace production data. Prefer prompt when unsure.

Before you start

  • Know whether source or target is authoritative.
  • Run dry runs for any production import.
  • Keep backups until verification is complete.

Strategy guide

ConstantTypeDefaultDescription
BRICKSSYNC_STORAGE_PATHstring/uploads/bricks-syncDirectory for snapshot files.
BRICKSSYNC_MODEstringtwo-waySync direction.
BRICKSSYNC_AUTO_EXPORTboolfalseExport when Bricks saves.
BRICKSSYNC_GITboolfalseAuto-commit snapshots.

Runbook

  1. Dry-run the import.
  2. Open pending conflicts in Config/Tools or the import UI.
  3. Compare source and target.
  4. Apply the chosen strategy.
  5. Import and verify Activity.

Screenshots

What is a Conflict?
What is a Conflict?
Prompt before overwrite
For pages, fields, global styles, and production templates, prompt/dry-run is safer than default overwrite.