jj/.gitattributes

Cargo.lock linguist-generated=true merge=binary
flake.lock linguist-generated=true merge=binary
poetry.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: Set up `mkdocs` and `poetry` I initially was thinking of using `mdbook`, which looks a little better, but I think versioning the docs is important, and the features I want are pretty much only supported by the Mkdocs' "Material" theme. Mkdocs is written in Python. The prerequesites for building docs on your machine should be to install Python and Poetry, everything else should be installed automatically by Poetry. See the edits to `contributing.md` for more details. 2023-08-18 23:43:20 +00:00			`poetry.lock linguist-generated=true merge=binary`