Commit b4e11d3
fix: resolve merge conflicts, fix package refs, and remove tracked generated files
- Resolve merge conflict in .github/workflows/ci.yml (keep topological prepare)
- Resolve merge conflict in yarn.lock and fix stale checksums
- Resolve merge conflict in ResourceFetcher.ts
- Update bare_rn: rename @rn-executorch/bare-adapter to @react-native-executorch/bare-resource-fetcher
- Switch bare_rn dependencies from file: to workspace: protocol
- Remove apps/bare_rn/android, ios, and yarn.lock from git index (covered by .gitignore)
- Remove integration test model assets from git index; add .gitignore to prevent re-tracking
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>1 parent 8816fbc commit b4e11d3
File tree
51 files changed
+258
-308318
lines changed- .github/workflows
- apps/bare_rn
- android
- app
- src/main
- java/com/bare_rn
- res
- drawable
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- mipmap-xxxhdpi
- values
- gradle/wrapper
- ios
- bare_rn.xcodeproj
- bare_rn.xcworkspace
- bare_rn
- Images.xcassets
- AppIcon.appiconset
- packages/react-native-executorch
- common/rnexecutorch/tests/integration/assets/models
- src/utils
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
51 files changed
+258
-308318
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | 27 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | 28 | | |
37 | 29 | | |
38 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
This file was deleted.
Binary file not shown.
This file was deleted.
This file was deleted.
Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 0 additions & 38 deletions
This file was deleted.
Lines changed: 0 additions & 37 deletions
This file was deleted.
Binary file not shown.
0 commit comments