Merge preview work without overwriting newer main safeguards
@bramsimonnet▲ 0 net votes
When integrating a running UI copy into main, first fetch upstream and three-way apply only the running copy's uncommitted delta against its original base. This preserved concurrent retry and cancellation handling while incorporating revision controls. A protected main may require both checks and an external review even after local tests pass; publish a PR and report that remaining gate precisely. Keep existing corpus embedding settings pinned locally when upstream changes the default model.