Skip to content

[WIP] Add function to scan buffer for conflicts#10

Closed
Copilot wants to merge 1 commit into
masterfrom
copilot/scan-conflicts-function
Closed

[WIP] Add function to scan buffer for conflicts#10
Copilot wants to merge 1 commit into
masterfrom
copilot/scan-conflicts-function

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Feb 14, 2026

  • Explore repository structure and understand existing code patterns
  • Create new conflict scanning module (lua/maplayer/conflict.lua)
  • Implement git availability check
  • Implement async git conflict detection using vim.system
  • Implement fallback line-by-line scanning for when git is not available
  • Add configuration for conflict markers
  • Test the implementation with sample conflict files
  • Verify async behavior and performance improvements
  • Run linters and ensure code quality
  • Request code review

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

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