- 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>
- 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>
- 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>
- 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>
copilot-swe-agent[bot]
git