Editing branch stuck out of sync with published version — "integrate changes" fails, no way to reset (Retool-managed git)

Summary

On a Cloud instance using the new app builder with Retool-managed source control, an editing branch is stuck out of sync with the published version — the AI-assisted 'Integrate changes' / pull from main fails, and 'Reset branch' doesn't restore a clean, in-sync state.

AI Response

This pattern has two documented causes. Recent 'Integrate changes' / git-pull-main failures in the new app builder were traced by Retool staff to Vite port collisions in the sandbox, which was fixed in 4.17.0 and completed its Cloud rollout around July 2, 2026 — so first confirm the branch is being edited in a freshly initialized in-editor thread and retry the integrate/pull, since older threads can stay pinned to a stale origin/main. Separately, note that 'Reset branch' does not apply merge commits into the editor; it resets the local app to a baseline snapshot, which is why previously merged changes can surface as removals and make the branch look permanently out of sync. To recover a clean state, avoid committing those 'removal' diffs and instead recreate the feature branch fresh from main, then re-apply the outstanding work — Retool-managed source control is designed for short-lived, mostly linear branches, so long-running or externally-merged branches on the same app are a known limitation.

Sources

:bookmark: Source control sync broken for one app (can't pull main / AI build sandbox seeds empty)
A new-app-builder Cloud report of the same 'Integrate changes'/pull-main failure that Retool staff attributed to a Vite port-collision bug fixed in 4.17.0 (rolled out to Cloud by early July 2026).
:bookmark: Reset branch to merge changes from main
A solved topic where Retool Support explains why 'Reset branch' leaves a branch looking out of sync and recommends recreating the branch from main rather than committing the phantom removal diffs.

The Community Team is testing out a new automation. Let us know if it's helpful (or not) by leaving a :heart:, :+1:, or :-1:. Or by marking this post as the "Solution"! Let us know if you have any feedback here. :rocket: