Skip to content

Update ContextForge Memory to use pr-conflict-resolver package #75

@VirtualAgentics

Description

@VirtualAgentics

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

  1. Add pr-conflict-resolver to requirements-dev.txt
  2. Test the package with existing workflows
  3. Remove local scripts once package is verified
  4. Update documentation and workflows
  5. Verify all functionality works as expected

Metadata

Metadata

Assignees

No one assigned

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions