mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

docs: explain long conflict markers
Some checks failed
binaries / Build binary artifacts (push) Has been cancelled
Details
nix / flake check (push) Has been cancelled
Details
build / build (, macos-13) (push) Has been cancelled
Details
build / build (, macos-14) (push) Has been cancelled
Details
build / build (, ubuntu-latest) (push) Has been cancelled
Details
build / build (, windows-latest) (push) Has been cancelled
Details
build / build (--all-features, ubuntu-latest) (push) Has been cancelled
Details
build / Build jj-lib without Git support (push) Has been cancelled
Details
build / Check protos (push) Has been cancelled
Details
build / Check formatting (push) Has been cancelled
Details
build / Check that MkDocs can build the docs (push) Has been cancelled
Details
build / Check that MkDocs can build the docs with latest Python and uv (push) Has been cancelled
Details
build / cargo-deny (advisories) (push) Has been cancelled
Details
build / cargo-deny (bans licenses sources) (push) Has been cancelled
Details
build / Clippy check (push) Has been cancelled
Details
Codespell / Codespell (push) Has been cancelled
Details
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Has been cancelled
Details
Scorecards supply-chain security / Scorecards analysis (push) Has been cancelled
Details

Browse source
This commit is contained in:
Scott Taylor 2024-12-24 11:44:04 -06:00 committed by Scott Taylor
parent e5361c6cc0
commit 0dbcdf7233
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
docs/conflicts.md
View file

@ -164,3 +164,23 @@ ORANGE
This conflict marker style only supports 2-sided conflicts though, so it falls This conflict marker style only supports 2-sided conflicts though, so it falls
back to the similar "snapshot" conflict markers if there are more than 2 sides back to the similar "snapshot" conflict markers if there are more than 2 sides
to the conflict. to the conflict.
## Long conflict markers
Some files may contain lines which could be confused for conflict markers. For
instance, a line could start with `=======`, which looks like a Git-style
conflict marker. To ensure that it's always unambiguous which lines are conflict
markers and which are just part of the file contents, `jj` sometimes uses
conflict markers which are longer than normal:
```
<<<<<<<<<<<<<<< Conflict 1 of 1
%%%%%%%%%%%%%%% Changes from base to side #1
-Heading
+HEADING
=======
+++++++++++++++ Contents of side #2
New Heading
===========
>>>>>>>>>>>>>>> Conflict 1 of 1 ends
```