mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-01 00:50:57 +00:00
472fd35ff1
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. |
||
|---|---|---|
| .. | ||
| design | ||
| governance | ||
| technical | ||
| bookmarks.md | ||
| cli-reference.md | ||
| code-of-conduct.md | ||
| community_tools.md | ||
| config.md | ||
| config.toml | ||
| conflicts.md | ||
| contributing.md | ||
| design_doc_blueprint.md | ||
| design_docs.md | ||
| FAQ.md | ||
| filesets.md | ||
| git-comparison.md | ||
| git-compatibility.md | ||
| github.md | ||
| glossary.md | ||
| index.md | ||
| install-and-setup.md | ||
| operation-log.md | ||
| related-work.md | ||
| revsets.md | ||
| roadmap.md | ||
| sapling-comparison.md | ||
| templates.md | ||
| testimonials.md | ||
| tutorial.md | ||
| windows.md | ||
| working-copy.md | ||