> ## Documentation Index
> Fetch the complete documentation index at: https://docs.useshipd.com/llms.txt
> Use this file to discover all available pages before exploring further.

# Resolve a push conflict

> Recover from a stale-version 409 without clobbering production.

## Overview

Maya and Jordan both edited `search-variant`. Jordan pushed first. Maya's `shipd push` exits `3` (conflict / stale `expectedVersions`).

## Prefer pull

```bash theme={null}
shipd pull --project web-app --env production
```

`shipd.config.ts` and `src/generated/flags.ts` regenerate. Re-apply Maya's edits, then:

```bash theme={null}
shipd diff
shipd push --yes
```

<Warning>
  `shipd pull` rewrites the config file. Comments and unknown local fields are dropped. Commit first.
</Warning>

## Override (audited)

```bash theme={null}
shipd push --force --yes
```

`--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.