Commit d938cbc
Phase 2: Merge react_on_rails_pro repository via git subtree with complete history preservation
This commit implements Phase 2 of the monorepo merger plan:
- Merge react_on_rails_pro repository using git subtree add to preserve complete git history
- Update LICENSE.md to include react_on_rails_pro/ directory as Pro-licensed
- Maintain strict license compliance with clear directory boundaries
- Preserve dual CI systems (GitHub Actions + CircleCI) temporarily
- Add checklist for post-merge CI fixes that may be needed
- All pro files properly contained in react_on_rails_pro/ subdirectory
- Core package functionality remains unchanged at root level
The merge preserves all 666+ commits from the pro repository while maintaining
the complete history of the core repository. Both packages can build
independently and CI systems are operational.
Next: Address any CI failures and proceed to Phase 3 (workspace structure).
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <[email protected]>1 parent 040bc36 commit d938cbc
2 files changed
+25
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
182 | 182 | | |
183 | 183 | | |
184 | 184 | | |
| |||
210 | 210 | | |
211 | 211 | | |
212 | 212 | | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
213 | 228 | | |
214 | 229 | | |
215 | 230 | | |
| |||
0 commit comments