mirror of
https://github.com/iflytek/skillhub.git
synced 2026-08-28 11:25:00 +00:00
Resolved 9 conflicts according to documented strategy: - .gitignore: kept both entries (docs/review/ + CLAUDE.md) - ClawHubCompatController.java: manual merge (use @AuthenticationPrincipal + platformRoles) - ClawHubCompatControllerTest.java: kept ours (HEAD security tests) - CliControllerTest.java: kept ours (HEAD platform roles tests) - ReviewPermissionChecker.java: kept ours (stricter permission model) - SkillPublishService.java: kept theirs (main SUPER_ADMIN bypass + events) - SkillPublishServiceTest.java: kept theirs (main complete test suite) - router.tsx: manual merge (HEAD's createLazyRouteComponent + main's privacy/terms) - markdown-renderer.tsx: kept ours (HEAD frontmatter stripping + styles) All A1-A9 security fixes preserved. No new logic introduced. |
||
|---|---|---|
| .. | ||
| check-openapi-generated.sh | ||
| dev_process.py | ||
| runtime.sh | ||
| smoke-test.sh | ||
| validate-release-config.sh | ||