-
Notifications
You must be signed in to change notification settings - Fork 1
Open
Labels
Description
Overview
Replace local conflict resolution scripts with the pr-conflict-resolver package dependency.
Background
Once the conflict resolution system has been extracted to a standalone repository and published to PyPI, ContextForge Memory should be updated to use the package instead of local scripts.
Tasks
- Add pr-conflict-resolver to requirements-dev.txt
- Remove local scripts/apply_cr_suggestions.py
- Remove local scripts/handlers/
- Update Makefile to use pr-resolve CLI
- Update documentation
- Test integration
- Update CI/CD workflows
Dependencies
- Extract conflict resolution to standalone repository (must be completed first)
Benefits
- Reduced maintenance: No need to maintain local conflict resolution code
- Consistency: Uses the same conflict resolution logic as other projects
- Updates: Automatic updates from the package maintainer
- Testing: Benefits from the comprehensive test suite in the package
Migration Plan
- Add pr-conflict-resolver to requirements-dev.txt
- Test the package with existing workflows
- Remove local scripts once package is verified
- Update documentation and workflows
- Verify all functionality works as expected