git/WizardMerge
1
0
Fork 0
mirror of https://github.com/johndoe6345789/WizardMerge.git synced 2026-04-24 21:54:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
91 Commits 8 Branches 2 Tags
5d930abe14e094305b41781882d235d5ea65d447
Commit Graph

2 Commits

Author SHA1 Message Date
copilot-swe-agent[bot]
a0f7fcb63e Address code review feedback 
- Fix context analysis to use original file lines instead of merged lines
- Add named constants for confidence score weights
- Add named constant for import scan limit
- Improve code maintainability and documentation

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:47:17 +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