Commit 7f72ed0
Sync fork dev without dropping local commits
Merge upstream dev into the fork branch so the fork receives the 14 missing upstream commits while retaining the fork-only history on dev.
Constraint: Fork dev must preserve the existing 23 ahead commits.
Rejected: Rebase fork dev onto upstream dev | would rewrite fork history and risk disrupting open references.
Confidence: high
Scope-risk: moderate
Tested: npm run build
Tested: node dist/scripts/__tests__/codex-native-hook.test.js
Not-tested: Full npm test suite.
Co-authored-by: OmX <omx@oh-my-codex.dev>63 files changed
Lines changed: 4353 additions & 351 deletions
File tree
- crates/omx-explore
- src
- docs
- plugins/oh-my-codex/skills/ultragoal
- skills/ultragoal
- src
- catalog
- __tests__
- generated
- cli
- __tests__
- compat/fixtures/doctor
- config
- __tests__
- hooks
- __tests__
- notifications
- __tests__
- openclaw
- __tests__
- pipeline
- __tests__
- stages
- planning
- __tests__
- scripts
- __tests__
- team
- __tests__
- ultragoal
- __tests__
- templates
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| 77 | + | |
77 | 78 | | |
78 | 79 | | |
79 | 80 | | |
| |||
84 | 85 | | |
85 | 86 | | |
86 | 87 | | |
| 88 | + | |
87 | 89 | | |
88 | 90 | | |
89 | 91 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
0 commit comments