git/WizardMerge
1
0
Fork 0
mirror of https://github.com/johndoe6345789/WizardMerge.git synced 2026-04-25 14:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
114 Commits 8 Branches 2 Tags
ci/test-results
Commit Graph

9 Commits

Author SHA1 Message Date
copilot-swe-agent[bot]
cd2456db7c Fix C++ formatting issues with clang-format 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-29 18:45:12 +00:00
copilot-swe-agent[bot]
370f241eb9 Add TypeScript support to context and risk analyzers 
- Enhanced context_analyzer to detect TypeScript patterns (interfaces, types, enums, arrow functions, async functions)
- Updated risk_analyzer with TypeScript-specific critical patterns (as any, @ts-ignore, dangerouslySetInnerHTML, etc.)
- Added has_typescript_interface_changes() to detect type definition changes
- Added is_package_lock_file() to identify lock files
- Created comprehensive tests for TypeScript functionality
- All 46 tests passing

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 03:10:17 +00:00
johndoe6345789
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]
b624443bda Address code review feedback 
- Add sys/wait.h include for WEXITSTATUS macro
- Check config command results before commit
- Escape commit messages to prevent injection
- Fix potential npos overflow in string trimming
- Use std::filesystem::temp_directory_path() for portability
- Fix base branch parameter issue (clone already at base_ref)
- All tests still pass (17/17)

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:38:57 +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]
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]
57d51c32e5 Add tests, update TLA+ spec, and add comprehensive build documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:39:07 +00:00