Overview
Maya and Jordan both edited search-variant. Jordan pushed first. Maya’s shipd push exits 3 (conflict / stale expectedVersions).
Prefer pull
shipd.config.ts and src/generated/flags.ts regenerate. Re-apply Maya’s edits, then:
shipd pull rewrites the config file. Comments and unknown local fields are dropped. Commit first.
Override (audited)
--force wins the CAS check and is audited. Use it when you intend to overwrite the remote version.
There is no lockfile. managedBy is not a lock. --adopt does nothing.
