Skip to content

Commit ecce429

Browse files
committed
docs(fork): record upstreamed divergences and prune their entries
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
1 parent f6784ca commit ecce429

5 files changed

Lines changed: 19 additions & 128 deletions

docs/fork/0001-file-explorer-mention-actions.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

docs/fork/0002-draft-hero-landing.md

Lines changed: 0 additions & 32 deletions
This file was deleted.

docs/fork/0004-file-tree-drag-to-chat.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

docs/fork/0005-composer-chip-selection-highlight.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

docs/fork/README.md

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
This directory tracks everything this fork carries that is not in upstream
44
[pingdotgg/t3code](https://github.com/pingdotgg/t3code). One numbered entry per
5-
divergence, newest last. When upstream ships an equivalent, update the status
6-
here and note what replaced our version instead of deleting the entry, so the
7-
history of what we carried and why stays reconstructable.
5+
divergence, newest last. When upstream ships an equivalent, the entry file is
6+
removed and the divergence moves to the upstreamed table below, so the record
7+
of what we carried, why, and what replaced it stays reconstructable. Numbers
8+
are never reused.
89

910
## Writing an entry
1011

@@ -29,10 +30,18 @@ Each entry uses these sections:
2930

3031
## Ledger
3132

32-
| # | Divergence | PR | Status |
33-
| ---- | ----------------------------------------------------------------------------------------------------- | -------------------------------------------------- | ------ |
34-
| 0001 | [File explorer mention actions and zoom-aware context menus](./0001-file-explorer-mention-actions.md) | [#1](https://github.com/TrogonStack/t3code/pull/1) | active |
35-
| 0002 | [Draft hero landing on the index route](./0002-draft-hero-landing.md) | [#2](https://github.com/TrogonStack/t3code/pull/2) | active |
36-
| 0003 | [Native subagent threads for Claude orchestrators](./0003-native-subagent-threads.md) | [#3](https://github.com/TrogonStack/t3code/pull/3) | active |
37-
| 0004 | [Drag files from the explorer into the chat](./0004-file-tree-drag-to-chat.md) | [#4](https://github.com/TrogonStack/t3code/pull/4) | active |
38-
| 0005 | [Selection highlight over composer chips](./0005-composer-chip-selection-highlight.md) | [#5](https://github.com/TrogonStack/t3code/pull/5) | active |
33+
| # | Divergence | PR | Status |
34+
| ---- | ------------------------------------------------------------------------------------- | -------------------------------------------------- | ------ |
35+
| 0003 | [Native subagent threads for Claude orchestrators](./0003-native-subagent-threads.md) | [#3](https://github.com/TrogonStack/t3code/pull/3) | active |
36+
37+
## Upstreamed
38+
39+
Divergences upstream has since merged. Our copies were dropped in favor of
40+
upstream's versions during sync, and the entry files were removed.
41+
42+
| # | Divergence | PR | Upstream PR |
43+
| ---- | ---------------------------------------------------------- | -------------------------------------------------- | --------------------------------------------------------------- |
44+
| 0001 | File explorer mention actions and zoom-aware context menus | [#1](https://github.com/TrogonStack/t3code/pull/1) | [pingdotgg#4054](https://github.com/pingdotgg/t3code/pull/4054) |
45+
| 0002 | Draft hero landing on the index route | [#2](https://github.com/TrogonStack/t3code/pull/2) | [pingdotgg#4055](https://github.com/pingdotgg/t3code/pull/4055) |
46+
| 0004 | Drag files from the explorer into the chat | [#4](https://github.com/TrogonStack/t3code/pull/4) | [pingdotgg#4140](https://github.com/pingdotgg/t3code/pull/4140) |
47+
| 0005 | Selection highlight over composer chips | [#5](https://github.com/TrogonStack/t3code/pull/5) | [pingdotgg#4139](https://github.com/pingdotgg/t3code/pull/4139) |

0 commit comments

Comments
 (0)