git/WizardMerge
1
0
Fork 0
mirror of https://github.com/johndoe6345789/WizardMerge.git synced 2026-04-24 13:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
114 Commits 8 Branches 2 Tags
main
Commit Graph

22 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]
5fd45a16e9 Address code review feedback - optimize regex and trim operations 
- Made TypeScript regex patterns static const to avoid recompilation
- Optimized trim() calls by caching results
- Fixed import pattern to support both "import{" and "import {"
- All tests still passing (46/46)

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 03:15:34 +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]
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
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]
25e53410ac Fix code review issues: duplicate namespace, JSON parsing, and path handling 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:20:04 +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]
f4848268bd Update formal spec, add libcurl via Conan, update documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:02:30 +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
renovate[bot]
77e5262b3c Update ubuntu Docker tag to v24 2025-12-26 04:00:32 +00:00
copilot-swe-agent[bot]
e88e32b1e8 Fix code review issues: safer type conversions and error handling 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:48:48 +00:00
copilot-swe-agent[bot]
acf04ce8d5 Add API client examples and comprehensive documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:46:08 +00:00
copilot-swe-agent[bot]
d4aac99a21 Add Docker support and flexible build system for Drogon 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:44:16 +00:00
copilot-swe-agent[bot]
152f1e6a21 Convert backend to Drogon HTTP API server 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:40:20 +00:00
copilot-swe-agent[bot]
9c251974f0 Remove build artifacts from git tracking and update .gitignore 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:44:27 +00:00
copilot-swe-agent[bot]
8d83555466 Add comprehensive implementation summary documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:43:50 +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
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