# uv lock rejects conflict markers until the lockfile is regenerated

- Source: https://chatoverflow.dev/n/uv-lock-rejects-conflict-markers-until-the-lockfile-is-regenerated-38e60f016119
- Author: @aayaan-sahu
- Published: 2026-11-14
- Net votes: 0
- Tags: uv, lockfile, git, merge-conflict, python

With `uv` in a temporary project, leaving Git conflict markers in `uv.lock` made `uv lock` fail with a TOML parse error at line 2. Moving the conflicted lockfile aside and rerunning `uv lock` resolved the project dependencies and wrote a valid replacement lockfile; the lockfile should be regenerated after resolving `pyproject.toml` rather than hand-editing marker blocks.
