Reorganize repository structure and clean up documentation
Clean up and organize the flask-shopdb repository for better maintainability and discoverability: ## Changes - Update .gitignore for build artifacts (publish/, data/, 122M total) - Reorganize .claude/ into 6 subdirectories with README navigation - Consolidate overlapping MCP setup guides into MCP-QUICK-START.md - Move deployment docs from root to docs/deployment/ - Archive dated status reports to .claude/archived/ - Delete temporary files (logs, backups, empty reports, ~50K) ## New Structure .claude/ organized into: - setup/ - MCP, VM, Hyper-V, GitHub setup guides + scripts (17 files) - plans/ - Feature plans and protocols (5 files) - maintenance/ - Deployment checklists and reports (4 files) - archived/ - Historical documentation (9 files) - skills/ - Claude Code automation (5 files) - workflows/ - Security audit workflow (1 file) docs/deployment/ created with 6 deployment guides: - LOCAL-DEV-SETUP.md, DOCKER-SETUP.md, DOCKER-PREBUILT-APPROACH.md - PRODUCTION-READINESS.md, DEPLOY-TO-VM.md, README.md Root directory cleaned to essential docs only: - CLAUDE.md, README.md, CONTRIBUTING.md, CHANGELOG.md Benefits: - Clear navigation via README.md in each subdirectory - No duplicate/overlapping documentation - Large artifacts properly gitignored (won't bloat repository) - Historical context preserved in archived/ See .claude/CLEANUP-SUMMARY.md for complete details. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
82
.claude/skills/merge-wilm.md
Normal file
82
.claude/skills/merge-wilm.md
Normal file
@@ -0,0 +1,82 @@
|
||||
---
|
||||
name: merge-wilm
|
||||
description: Merge wilm branch into wj with proper version coordination
|
||||
---
|
||||
|
||||
Merge the latest commits from wilm branch into wj branch, resolving common conflicts and coordinating agent/tray versions.
|
||||
|
||||
## Steps
|
||||
|
||||
1. Ensure we're on wj branch and up to date:
|
||||
```
|
||||
git checkout wj
|
||||
git fetch origin
|
||||
```
|
||||
|
||||
2. Check what's new on wilm:
|
||||
```
|
||||
git log wj..origin/wilm --oneline
|
||||
```
|
||||
Show the user what commits will be merged.
|
||||
|
||||
3. Attempt the merge:
|
||||
```
|
||||
git merge origin/wilm --no-edit
|
||||
```
|
||||
|
||||
4. If conflicts occur (common files):
|
||||
- **agent/ShopDbEndpointAgent/ShopDbEndpointAgent.csproj**: Most common conflict
|
||||
- **plugins/endpoints/api/routes.py**: If both branches touched operator reports or fleet alerts
|
||||
|
||||
5. Resolve csproj conflicts:
|
||||
- Keep ALL version history comments from both branches
|
||||
- Merge version numbers by taking higher version and bumping patch
|
||||
- Example: wj has 1.13.5, wilm has 1.14.0 → result is 1.14.1 or 1.14.2
|
||||
- Add merge comment explaining what was combined
|
||||
|
||||
6. Resolve routes.py conflicts:
|
||||
- Usually wilm has infrastructure changes, wj has feature changes
|
||||
- Preserve both sets of changes
|
||||
- Check imports at top of file are complete
|
||||
|
||||
7. Stage resolved files and commit:
|
||||
```
|
||||
git add <resolved-files>
|
||||
git commit -m "Merge wilm into wj"
|
||||
```
|
||||
|
||||
8. Bump tray version to match agent:
|
||||
- Edit ShopDbEndpointAgent.Tray/ShopDbEndpointAgent.Tray.csproj
|
||||
- Add version comment
|
||||
- Commit separately
|
||||
|
||||
9. Show summary:
|
||||
```
|
||||
git log --oneline --graph -10
|
||||
```
|
||||
|
||||
## Common Conflicts
|
||||
|
||||
**Agent csproj version block**:
|
||||
- Preserve all version history from both branches
|
||||
- Increment version number combining both
|
||||
- Document what was merged
|
||||
|
||||
**Operator report email function**:
|
||||
- wilm usually refactors structure
|
||||
- wj usually adds features (FQDN, machine relationships)
|
||||
- Combine both approaches
|
||||
|
||||
## Version Numbering Rules
|
||||
|
||||
- Agent and tray MUST be bumped together
|
||||
- Format: X.Y.Z
|
||||
- Merge scenarios:
|
||||
- wj 1.13.5 + wilm 1.14.0 → 1.14.1 (take wilm minor, bump patch)
|
||||
- Add comment: "Merge wilm X.Y.Z changes with wj coordination releases"
|
||||
|
||||
## Notes
|
||||
|
||||
- Always review the wilm commits before merging
|
||||
- Test after merge if possible
|
||||
- Tray version lags agent by pattern: agent 1.14.2 pairs with tray 1.6.8
|
||||
Reference in New Issue
Block a user