Philip Metzger 6cbb21f86f conflicts: document the "same-change rule" ...

I think its time to finally give our Conflict Algebra rule a term.
This is will make our documentation alot easier, and gives it a name for
new design docs.

All credit goes to @martinvonz for coming up with the term in #4988.

2025-05-14 15:08:29 +00:00

..

design

view: rename workspace "id" to "name"

2025-03-31 03:39:29 +00:00

governance

meta: add initial GOVERNANCE.md

2025-02-10 17:39:34 +00:00

images

Replace the PNG logo with a vector SVG version.

2025-03-11 22:44:13 +00:00

technical

conflicts: document the "same-change rule"

2025-05-14 15:08:29 +00:00

bookmarks.md

bookmarks: First step to make target revision a required argument to bookmark create/move/set.

2025-02-11 22:21:19 +00:00

cli-reference.md

mkdocs: update mkdocs-material and mkdocs-include-markdown-plugin

2025-02-13 17:30:21 +00:00

code-of-conduct.md

docs: s/socio-economics/socioeconomics/ per codespell suggestion

2024-05-24 11:34:03 +09:00

community_tools.md

Update community_tools.md

2025-03-07 01:13:25 +00:00

config-schema.json

docs: Expose config-schema.json in the docs site

2025-01-14 13:45:36 +00:00

config.md

docs: clarify commit_trailers deduplication

2025-05-08 09:17:56 +00:00

config.toml

docs: document git.fetch and git.push config options

2024-02-09 12:03:42 -06:00

conflicts.md

docs: fix syntax highlighting for conflicts.md

2025-03-03 22:42:14 +00:00

contributing.md

docs/contributing: remove explicit enabling of copy button in code snippets

2025-04-21 23:12:43 +00:00

core_tenets.md

docs/core_tenets: fix typo

2025-05-10 15:36:46 +00:00

design_doc_blueprint.md

docs: Remove trailing whitespace in markdown files

2024-09-13 13:06:28 +02:00

design_docs.md

doc: update some references to "the native backend"

2025-03-21 16:27:51 +00:00

FAQ.md

docs: document code to avoid duplicating gerrit change-id

2025-05-11 17:00:32 +00:00

filesets.md

fileset docs: edits to quoting and file pattern instructions

2025-03-11 03:00:58 +00:00

git-command-table.md

docs: convert Git command table from HTML to YAML

2025-04-21 00:45:01 +00:00

git-command-table.yml

docs: Remove deprecated backout command from git table

2025-05-09 15:26:53 +00:00

git-comparison.md

docs: move Git command table to a separate page

2025-02-10 15:29:32 +00:00

git-compatibility.md

docs: update git compatibility docs for commit signing

2025-05-04 22:52:24 +00:00

github.md

docs: use styled admonition blocks for warnings

2025-02-05 23:09:02 +11:00

glossary.md

git_backend: derive the change ID from the git change-id header

2025-04-09 16:42:56 +00:00

index.md

docs/index: use sentence case consistently for docs page names

2025-04-18 22:25:36 +00:00

install-and-setup.md

docs: Add support for installing JJ using the winget command.

2025-05-13 05:42:03 +00:00

operation-log.md

bookmarks: update some leftover uses of the word "branch"

2024-09-11 19:19:31 -07:00

paid_contributors.md

paid_contributors: sort contributor list

2025-04-18 20:30:59 +00:00

related-work.md

politics: delete references to Pijul

2024-04-14 13:16:08 -07:00

releasing.md

docs: improve release process tidbits (again)

2025-05-07 17:07:16 +00:00

revsets.md

revset: add signed function

2025-04-12 14:14:26 +00:00

roadmap.md

docs/cli: update URLs to from martinvonz user to jj-vcs org

2024-12-17 12:44:44 -08:00

sapling-comparison.md

docs: update Sapling comparison logs

2025-02-01 16:50:53 +00:00

style_guide.md

docs: add a style guide

2025-04-10 22:01:48 +00:00

templates.md

templater: introduce newtype to format ref/remote name in revset syntax

2025-05-13 23:54:47 +00:00

testimonials.md

docs: add some more testimonials

2025-04-08 20:55:09 +00:00

tutorial.md

docs: Update tutorial.md using the command in version 0.29.0

2025-05-12 20:41:22 +00:00

windows.md

docs/windows: remove unused link

2025-02-04 12:59:26 +00:00

working-copy.md

docs: correct description of tracking of ignored files

2025-03-06 22:29:05 +00:00