files: add option to resolve conflicts word by word #5917
yujaci.yml
on: pull_request
Matrix: nix flake
Matrix: check-cargo-deny
Matrix: test
build (no git)
1m 27s
check (protos)
46s
check (rustfmt)
20s
check (clippy)
1m 28s
check (codespell)
12s
check (doctests)
3m 6s
check (mkdocs)
17s
check (Cargo.lock dependency count)
5s
check (latest mkdocs, optional)
17s
check (zizmor)
32s
required checks (merge queue)
0s