Commit 770622e
docs(website): sync content with the v3.4.0 conflict engine (#119)
The site described the engine as it was several releases ago. Audited every
engine-facing page against the real registry and fixed:
- Remove the phantom `section_only_change` pattern — it was listed as an
auto-applied pattern on the landing page and conflict-engine page but has
never existed in packages/core. Replaced with real patterns; the grids now
show the true 12-entry registry with accurate auto/proposed/opt-in flags.
- Correct the hardcoded "10 patterns" count everywhere (landing 5 locales,
conflict-engine, features, llms.txt, 5 compare pages, 1 blog post) to
"8 deterministic patterns" (the auto-applied deterministic count) — the
marketing number, distinct from the full registry.
- Normalize the 95% claim to "trivial conflicts" where it read "of merge
conflicts" (index.md, conflict-engine.md); keep the figure.
- Document the v3.4.0 capabilities in guide/conflict-resolution.md:
token_level_merge, refactoring_aware_merge, llm_proposed, the base-recovery
pipeline step, and value_only_change's semver/timestamp-max resolution.
- core-api.md: fix "8 types", add the missing exports (summarizeTiers,
resolveAsync, TokenMergeTrace, ResolutionTier, TierSummary, …).
- index.md JSON-LD softwareVersion 3.2.0 → 3.4.0, and add that field to
bump-version.sh so it can't drift again.
- Refresh the hero announce + "New in vX" badge to v3.4 (5 locales).
Website build passes. (Left for a separate copy pass: the "What's New" tab
feature cards still show v2.x features.)
disabled
Co-authored-by: Laurent Guitton <laurent.guitton@dendreo.com>1 parent 4b4c523 commit 770622e
15 files changed
Lines changed: 142 additions & 76 deletions
File tree
- scripts
- website
- .vitepress/theme
- blog
- compare
- guide
- public
- reference
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
112 | 119 | | |
113 | 120 | | |
114 | 121 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
2 | 5 | | |
3 | 6 | | |
4 | 7 | | |
| 8 | + | |
5 | 9 | | |
6 | 10 | | |
7 | 11 | | |
8 | 12 | | |
9 | | - | |
10 | | - | |
11 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
12 | 17 | | |
13 | 18 | | |
14 | 19 | | |
| |||
19 | 24 | | |
20 | 25 | | |
21 | 26 | | |
22 | | - | |
| 27 | + | |
23 | 28 | | |
24 | 29 | | |
25 | 30 | | |
| |||
56 | 61 | | |
57 | 62 | | |
58 | 63 | | |
59 | | - | |
60 | | - | |
| 64 | + | |
| 65 | + | |
61 | 66 | | |
62 | 67 | | |
63 | 68 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
0 commit comments