Commit Graph

7 Commits

Author SHA1 Message Date
7d428db725 Merge branch 'main' into copilot/context-and-risk-analysis 2025-12-27 02:59:00 +00:00
copilot-swe-agent[bot]
7c489b5c55 Implement context and risk analysis for merge conflicts
- Add context analyzer to extract function/class names and imports
- Add risk analyzer to assess resolution strategies (ours/theirs/both)
- Integrate analysis into three-way merge conflicts
- Update MergeController to include analysis in API responses
- Add comprehensive test coverage for both analyzers

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
2025-12-27 02:44:40 +00:00
copilot-swe-agent[bot]
5cca60ca9f Add Git CLI integration and enhance roadmap documentation
- Implement Git CLI wrapper module (git_cli.h/cpp)
- Add branch creation support to PRController
- Document semantic merging approaches in Phase 2
- Document SDG analysis implementation from research
- Add Bitbucket and extensible platform support docs
- Update Phase 1.5 to mark Git CLI integration complete
- Add comprehensive tests for Git CLI operations

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
2025-12-27 02:33:18 +00:00
copilot-swe-agent[bot]
c377c5f4aa Add GitLab support for merge request resolution alongside GitHub
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
2025-12-27 02:17:34 +00:00
copilot-swe-agent[bot]
c5a7f89b3f Fix code review issues: base64 decoding, includes, and struct fields
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
2025-12-27 02:05:15 +00:00
copilot-swe-agent[bot]
c2a5f5dd23 Add PR URL support with GitHub API integration
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
2025-12-27 01:56:24 +00:00
copilot-swe-agent[bot]
15e40ffd4c Implement Phase 1.1: Delete Python skeleton and create C++/TypeScript architecture
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
2025-12-25 08:37:29 +00:00