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
91 Commits 8 Branches 2 Tags
5d930abe14e094305b41781882d235d5ea65d447
Commit Graph

91 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
johndoe6345789
5d930abe14 Merge pull request #19 from johndoe6345789/copilot/context-and-risk-analysis 
Add context and risk analysis for merge conflicts
 2025-12-27 02:59:13 +00:00
johndoe6345789
7d428db725 Merge branch 'main' into copilot/context-and-risk-analysis 2025-12-27 02:59:00 +00:00
johndoe6345789
dcc0120b0c Merge pull request #20 from johndoe6345789/copilot/simulate-github-actions-repair 
Add TLA+ CI verification and fix specification syntax errors
 2025-12-27 02:57:34 +00:00
johndoe6345789
c3b6555605 Merge pull request #18 from johndoe6345789/copilot/add-git-cli-integration 
Add Git CLI integration and document Phase 2+ roadmap features
 2025-12-27 02:57:07 +00:00
copilot-swe-agent[bot]
86996650a2 Add documentation for context and risk analysis features 
- Comprehensive usage guide with examples
- API reference for HTTP and C++ interfaces
- Configuration options and testing instructions
- Security information and future enhancements

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:50:17 +00:00
copilot-swe-agent[bot]
0991703887 Address code review: remove unused imports and add documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:50:16 +00:00
copilot-swe-agent[bot]
1e33b43c25 Add documentation for TLA+ CI verification 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:47:59 +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]
60ad6c39c1 Add TLA+ CI support: script, config, and spec fixes 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:46:36 +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]
c7e5f23377 Add final summary documentation 
- Create FINAL_SUMMARY.md with complete overview
- Document all requirements compliance
- Include test results and metrics
- Summarize security and code quality checks

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:41:11 +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]
35f9a844e0 Initial plan 2025-12-27 02:36:32 +00:00
copilot-swe-agent[bot]
7865bedb09 Add comprehensive implementation documentation and finalize Git CLI integration 
- Create GIT_CLI_IMPLEMENTATION.md with full details
- Document architecture, usage, and security considerations
- Verify all 17 tests pass successfully
- Complete requirements from problem statement

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:36:13 +00:00
copilot-swe-agent[bot]
95e19968c9 Initial plan 2025-12-27 02:34:28 +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]
8d003efe5c Initial plan 2025-12-27 02:25:01 +00:00
johndoe6345789
78505fed80 Merge pull request #17 from johndoe6345789/copilot/add-wizardmerge-pull-request-url 
Add GitHub and GitLab Pull/Merge Request URL processing with automated conflict resolution
release-2 		2025-12-27 02:24:45 +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]
0e2a19c89f Add comprehensive implementation summary and pass security checks 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-27 02:07:44 +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
copilot-swe-agent[bot]
8fef2c0e56 Initial plan 2025-12-27 01:49:20 +00:00
johndoe6345789
663b91bb29 Merge pull request #16 from johndoe6345789/copilot/add-frontend-support 
Implement multi-frontend architecture: Qt6, Next.js, and CLI
release-1 		2025-12-27 01:45:39 +00:00
copilot-swe-agent[bot]
0d6d29eef4 Add detailed documentation about JSON handling limitations in CLI 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 04:20:56 +00:00
copilot-swe-agent[bot]
51373a4576 Update .gitignore for frontend build artifacts and test CLI frontend 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 04:16:37 +00:00
copilot-swe-agent[bot]
d9324c6c9c Create multi-frontend architecture with qt6, nextjs, and cli frontends 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 04:10:33 +00:00
copilot-swe-agent[bot]
ef2f5896b7 Initial plan 2025-12-26 04:03:47 +00:00
johndoe6345789
19bed6e65d Merge pull request #14 from johndoe6345789/renovate/major-react-monorepo 
Update react monorepo to v19 (major)
 2025-12-26 04:02:13 +00:00
johndoe6345789
bf1b8606e5 Merge pull request #15 from johndoe6345789/renovate/ubuntu-24.x 
Update ubuntu Docker tag to v24
 2025-12-26 04:01:56 +00:00
renovate[bot]
f4e90fe3ae Update react monorepo to v19 2025-12-26 04:01:49 +00:00
johndoe6345789
ad0847fd3b Merge pull request #12 from johndoe6345789/renovate/major-nextjs-monorepo 
Update dependency next to v16
 2025-12-26 04:01:02 +00:00
johndoe6345789
1acbc7b5f2 Merge pull request #11 from johndoe6345789/renovate/node-24.x 
Update dependency @types/node to v24
 2025-12-26 04:00:45 +00:00
renovate[bot]
77e5262b3c Update ubuntu Docker tag to v24 2025-12-26 04:00:32 +00:00
johndoe6345789
2d56d1c609 Merge pull request #13 from johndoe6345789/copilot/convert-backend-to-drogon 
Convert backend from CLI to Drogon HTTP API server
 2025-12-26 03:59:38 +00:00
copilot-swe-agent[bot]
5c544fd9e6 Add comprehensive conversion summary documentation 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-26 03:51:03 +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]
5ea670db23 Initial plan 2025-12-26 03:35:20 +00:00
renovate[bot]
528118bc30 Update dependency next to v16 2025-12-26 03:32:22 +00:00
renovate[bot]
e2b8ca342b Update dependency @types/node to v24 2025-12-26 03:32:19 +00:00
johndoe6345789
f508771654 Merge pull request #10 from johndoe6345789/copilot/implement-roadmap-md 
Replace Python skeleton with production C++/TypeScript architecture
 2025-12-26 03:31:21 +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]
e687410883 Fix frontend CSS: Replace Tailwind directives with plain CSS 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
 2025-12-25 08:41:10 +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