jj/.gitattributes

Cargo.lock linguist-generated=true merge=binary
flake.lock linguist-generated=true merge=binary
uv.lock linguist-generated=true merge=binary
build: mark `Cargo.lock` as `binary` for merging Otherwise, Git tries to resolve the conflict textually and introduces conflict markers, which make `cargo` unable to process the file (and therefore unable to resolve the conflicts automatically, such as with `cargo update`). 2022-04-26 05:42:32 +00:00			`Cargo.lock linguist-generated=true merge=binary`
			`flake.lock linguist-generated=true merge=binary`
docs: migrate from poetry to uv Our docs are built with MkDocs, which requires Python and several deps. Previously those deps were managed with Poetry, which is also written in Python. This commit replaces Poetry with `uv`, a Rust-based Python project/package manager, and thus removes several steps from the docs build process. Before: <install Python> <install pipx> pipx install poetry poetry install poetry run -- mkdocs serve After: <install uv> uv run mkdocs serve 2024-11-09 21:32:29 +00:00			`uv.lock linguist-generated=true merge=binary`