# Updating this downstream repository The `origin` remote is the Gitea repository `likang/makeCAD`. The `upstream` remote is `tangency-labs/solidcraft` on GitHub. Push project changes to `origin`. The local upstream push URL is disabled to prevent accidental publication there. The initial ZIP snapshot was matched to upstream commit `147b4049cf6db6e23c687f4550ebbe4272880437` (November 3, 2026). Commit `ec622d10880bc2077c2ea1ed9c436c825eeefb0e` records the local platform integration before the first update. The branch `backup/local-before-upstream-20261105` retains that checkpoint. The first synchronization targets upstream commit `16f3b939b354f6ebe27faa5ae566ccb90292f939` (November 5, 2026), including the egui/eframe 0.37 upgrade. The upstream workspace version is `0.40.0-rc.2`. Later upstream commits belong to the next synchronization. ## Future updates First inspect `git status` and commit the local work that must be retained. Review the staged files and run `cargo xtask ci` before each commit. Do not switch branches or edit the source while that check is running. With a clean working tree on `main`, run these commands one at a time: ```sh git fetch origin git merge --ff-only origin/main git branch backup/before-upstream-YYYYMMDD-HHMM git fetch upstream git merge --no-commit --no-ff upstream/main ``` Replace the backup branch suffix with the actual update date and time. If the fast-forward from Gitea fails, inspect the divergent commits before proceeding. Review the upstream changes and resolve any conflicts by preserving the intended local behavior alongside the upstream changes. Stage the resolved files with `git add`. Do not blindly select one entire side of a conflicted file. Before completing the merge, verify the staged changes and run the gate: ```sh git diff --cached --stat git diff --cached upstream/main --check cargo xtask ci git commit git push origin main ``` If validation fails, investigate the failure before treating the update as ready. To abandon an unfinished merge, use `git merge --abort`. The backup branch retains the committed state from before the update. Avoid `git reset --hard` and force pushes when synchronizing this repository. ## Local artifacts Build outputs in `target*/` and `dist/`, and generated review media under `docs/vibemake/evidence`, are excluded from source control. Keep any required artifact backups separately. The source archive made before the first update is stored in the sibling `solidcraft-migration-20261105-181759` directory. After a source update, rebuild the web engine with `node scripts/build-vibemake-cad.mjs` before deploying its new assets. A Git push does not rebuild or deploy an existing running web service.