Martin von Zweigbergk 1be8225046 docs: explain that approving your coworker's PRs should be avoided ... We want to avoid conflicts of interest (both real and apparent). Better to document this before it happens. By the way, Ilya and I both work for Google and we have approved lots of each others' PRs, but we work in very different parts of the company and I don't think any of the PRs have been specific to Google's interests.		2024-02-06 21:34:58 -08:00
..
design	sparse-v2: design doc proposition for Sparse Patterns refactoring	2024-02-01 16:02:14 -08:00
technical	docs: update description of conflicts to be about tree-level conflicts	2023-11-30 14:24:48 -08:00
branches.md	docs branches.md: insert definitions for related terms	2024-01-24 18:47:17 -08:00
cli-reference.md	docs: store output of jj util markdown-help, render it on the website	2024-01-30 14:58:32 -08:00
code-of-conduct.md	Replace contact method with addresses of active leads.	2023-11-28 13:48:22 -05:00
config.md	config.md: link to and mention the name of "scm-diff-editor"	2024-02-05 20:04:51 -08:00
config.toml	docs/config.toml: update the default diff editor	2023-10-25 13:05:04 -07:00
conflicts.md
contributing.md	docs: explain that approving your coworker's PRs should be avoided	2024-02-06 21:34:58 -08:00
FAQ.md	docs: Add FAQ item for git log	2024-02-06 15:03:51 -07:00
git-comparison.md	cli: deprecate jj checkout	2024-02-03 17:21:56 -06:00
git-compatibility.md	gc: implement basic GC for Git backend	2023-12-03 07:40:12 -08:00
github.md	git: turn git.auto-local-branch off by default	2023-12-17 08:30:24 +09:00
glossary.md	docs branches.md: insert definitions for related terms	2024-01-24 18:47:17 -08:00
index.md	docs index.md: explain that the website sidebar may be hidden	2023-10-04 05:25:37 -07:00
install-and-setup.md	install-and-setup.md: --strategy -> --strategies for cargo binstall	2023-11-21 20:19:38 -08:00
operation-log.md	op_walk: add support for op_id+ (children) operator	2024-01-02 10:30:08 +09:00
related-work.md	docs: add doc comparing jj to Sapling (#1708)	2023-06-28 06:56:57 +02:00
revsets.md	docs: emphasize and clarify log revsets relevant to people coming from git	2024-01-31 15:51:40 -08:00
sapling-comparison.md	mkdocs: make MkDocs work with more GitHub-like list formatting	2023-11-03 19:15:37 -07:00
templates.md	templater: add surround(prefix, suffix, content) function	2024-02-06 23:39:34 +09:00
tutorial.md	cli: deprecate jj checkout	2024-02-03 17:21:56 -06:00
windows.md	docs: add notes for Windows users	2024-01-29 12:16:15 -08:00
working-copy.md