mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 03:22:59 +00:00
e6a51d6637
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
nix / flake check (push) Waiting to run
build / build (, macos-13) (push) Waiting to run
build / build (, macos-14) (push) Waiting to run
build / build (, ubuntu-latest) (push) Waiting to run
build / build (, windows-latest) (push) Waiting to run
build / build (--all-features, ubuntu-latest) (push) Waiting to run
build / Build jj-lib without Git support (push) Waiting to run
build / Check protos (push) Waiting to run
build / Check formatting (push) Waiting to run
build / Run doctests (push) Waiting to run
build / Check that MkDocs can build the docs (push) Waiting to run
build / Check that MkDocs can build the docs with latest Python and uv (push) Waiting to run
build / cargo-deny (advisories) (push) Waiting to run
build / cargo-deny (bans licenses sources) (push) Waiting to run
build / Clippy check (push) Waiting to run
Codespell / Codespell (push) Waiting to run
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Waiting to run
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
If the parent tree contains conflicts, we want the index to also contain a conflict to ensure that the use can't accidentally commit conflict markers using `git commit`. Since we can't represent conflicts with more than 2 sides in the Git index, we need to add a dummy conflict in this case. We use ".jj-do-not-resolve-this-conflict" as the dummy conflict to indicate to the user that they should not attempt to resolve this conflict using Git. |
||
|---|---|---|
| .. | ||
| benches | ||
| gen-protos | ||
| proc-macros | ||
| src | ||
| tests | ||
| testutils | ||
| Cargo.toml | ||
| LICENSE | ||