sam_oneal/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add merge conflict UI and telescope picker #8

Merged
sam_oneal merged 2 commits from feat/merge-conflict-ui-and-telescope into main 2026-09-10 17:17:37 +00:00
Conversation 0 Commits 2 Files Changed 3
+67 -1
sam_oneal commented 2026-09-10 17:17:32 +00:00
Owner
Copy Link
Copy Source
No description provided.
sam_oneal added 2 commits 2026-09-10 17:17:33 +00:00
feat: add merge conflict UI and telescope picker 670f6325a1 
- Add unclash.nvim for interactive merge conflict resolution
  (inline highlighting, action buttons, 3-way merge editor,
  snacks picker integration)
- Enable LazyVim telescope extra with fzf-native for fuzzy finding
fix: remap unclash.nvim to conflict-free bindings 2906689a29 
Avoid overlapping LSP/diffview keymaps on a new Git > Conflict
(<leader>gx*) group. Navigation stays on ]x/[x.
sam_oneal merged commit 2906689a29 into main 2026-09-10 17:17:37 +00:00
sam_oneal deleted branch feat/merge-conflict-ui-and-telescope 2026-09-10 17:17:37 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
sam_oneal (Samuel ONeal)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: sam_oneal/nvim-config#8
Delete Branch "feat/merge-conflict-ui-and-telescope"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?