Scott Taylor 472fd35ff1 docs: rewrite conflict marker docs to include new styles ... The current docs for conflict markers start out by introducing Git "diff3" conflict markers, and then discussing how Jujutsu's conflict markers are different from Git's. I don't think this is the best way to explain it, because it requires the reader to first understand Git's conflict markers before they go on to learn Jujutsu's conflict markers. Instead, I think it's better to explain the conflict markers from scratch with a more detailed example so that we don't assume any particular knowledge of Git. This structure also works better with the new config option, since we can talk about the default option first, and then go on to explain alternatives later.		2024-11-23 08:28:47 -06:00
..
design	docs: fix a few typos noticed by automation at Google	2024-11-07 23:04:11 -08:00
governance	docs: introduce temporary governance voting process	2024-09-12 15:19:46 -07:00
technical	bookmarks: update some leftover uses of the word "branch"	2024-09-11 19:19:31 -07:00
bookmarks.md	cli: git push: do not push new bookmarks by default	2024-11-19 21:11:22 +09:00
cli-reference.md	docs: Remove trailing whitespace in markdown files	2024-09-13 13:06:28 +02:00
code-of-conduct.md	docs: s/socio-economics/socioeconomics/ per codespell suggestion	2024-05-24 11:34:03 +09:00
community_tools.md	docs/community_tools.md: add paragraph about jj-fzf	2024-11-16 23:49:03 +01:00
config.md	docs: rewrite conflict marker docs to include new styles	2024-11-23 08:28:47 -06:00
config.toml	docs: document git.fetch and git.push config options	2024-02-09 12:03:42 -06:00
conflicts.md	docs: rewrite conflict marker docs to include new styles	2024-11-23 08:28:47 -06:00
contributing.md	docs: tighten the "previewing docs" section	2024-11-20 06:06:53 +01:00
design_doc_blueprint.md	docs: Remove trailing whitespace in markdown files	2024-09-13 13:06:28 +02:00
design_docs.md	docs: Remove trailing whitespace in markdown files	2024-09-13 13:06:28 +02:00
FAQ.md	docs: remove trailing whitespace in .md	2024-11-12 01:16:08 +01:00
filesets.md	cli: enable fileset by default	2024-07-24 10:49:46 +09:00
git-comparison.md	docs: git blame comparison	2024-11-19 09:58:28 -08:00
git-compatibility.md	docs/git-compatibility.md: preserve working copy files when co-locating	2024-11-22 19:20:36 +01:00
github.md	cli: git push: do not push new bookmarks by default	2024-11-19 21:11:22 +09:00
glossary.md	docs: try to clarify that changes are not a first-class concept	2024-11-16 14:20:37 -08:00
index.md	docs: add link to roadmap from docs main page	2024-09-04 00:03:32 -07:00
install-and-setup.md	completion: improve docs for activation	2024-11-13 18:13:54 +01:00
operation-log.md	bookmarks: update some leftover uses of the word "branch"	2024-09-11 19:19:31 -07:00
related-work.md	politics: delete references to Pijul	2024-04-14 13:16:08 -07:00
revsets.md	revset: allow tags() to take a pattern for an argument	2024-11-20 00:47:23 +00:00
roadmap.md	docs: Make the Roadmap a toplevel website entry	2024-11-16 11:11:59 +01:00
sapling-comparison.md	docs: explain that jj was started 3 years before Sapling announcement	2024-06-20 05:24:28 +09:00
templates.md	templater: add != operator as user would probably expect that it exists	2024-11-10 21:41:24 +09:00
testimonials.md	docs: Remove trailing whitespace in markdown files	2024-09-13 13:06:28 +02:00
tutorial.md	Update tutorial for 0.23 and clarify diffedit	2024-11-22 21:23:12 +01:00
windows.md	docs: Remove trailing whitespace in markdown files	2024-09-13 13:06:28 +02:00
working-copy.md	docs: add more detail to section about stale working copies	2024-10-30 18:13:48 -07:00