Skip to content

Conversation

@Faria22
Copy link
Contributor

@Faria22 Faria22 commented Sep 30, 2025

  • Expose conflict discovery via M._get_conflicts and reuse it to populate the quickfix list
  • Add :HeadhunterQuickfix plus default <leader>gq binding and extend the test suite for parser/quickfix behaviour
  • Check against duplicate git-ls entries

@Faria22
Copy link
Contributor Author

Faria22 commented Sep 30, 2025

Fixes #5

@StackInTheWild StackInTheWild requested a review from Copilot October 6, 2025 11:51
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds quickfix list functionality to the headhunter plugin and improves conflict marker handling to support different git conflict styles (HEAD vs stash markers). The changes make conflict discovery reusable and provide a comprehensive view of all conflicts in the quickfix list.

Key changes:

  • Expose conflict discovery via M._get_conflicts and add quickfix population functionality
  • Generalize conflict marker parsing to handle both HEAD and stash-style conflicts
  • Add comprehensive test coverage for the new quickfix integration and stash-style conflict handling

Reviewed Changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
lua/headhunter/init.lua Main implementation adding quickfix functionality, exposing _get_conflicts, generalizing conflict parsing, and adding duplicate file handling
lua/tests/quickfix_spec.lua New test suite for quickfix integration functionality
lua/tests/headhunter_spec.lua Extended tests for stash-style conflict marker parsing
lua/tests/conflict_resolution_spec.lua Additional tests for handling stash-style conflict resolution
README.md Updated documentation to use <cmd> syntax for key mappings

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@StackInTheWild StackInTheWild merged commit 45eff16 into StackInTheWild:main Oct 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants