chore: add sync-main.sh to automate epic/v3's recurring dist/ conflicts

[wesleyboar]

Overview

Automates the mechanical part of syncing a dist/-untracked branch (e.g. epic/v3) with main.

Details

main commits dist/, epic/v3 doesn't, so every main commit touching dist/ produces a modify/delete conflict with a single correct resolution (keep it deleted). This script does that resolution, then rebuilds and untracks anything the merge re-added, and stops for a human on any other conflict.

Related

• refactor: v3 #454

Changes

• added bin/sync-main.sh
• added AGENTS.md note pointing to it

Testing

1. On a branch that doesn't commit dist/ (e.g. epic/v3), run bin/sync-main.sh
   _{(verified live against a disposable branch off epic/v3: correctly auto-resolved 10 dist/ modify/delete conflicts, rebuilt, and committed cleanly)}
2. Confirm it exits with an error and does nothing if run on a branch where dist/ isn't gitignored
3. Confirm it exits with an error and leaves the merge unresolved if a non-dist/ conflict is present

[qodo-code-review]

Qodo reviews are paused for this user.

Troubleshooting steps vary by plan Learn more →

On a Teams plan?
Reviews resume once this user has a paid seat and their Git account is linked in Qodo.
Link Git account →

Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center?
These require an Enterprise plan - Contact us
Contact us →