sam_oneal/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47 Commits 1 Branch 0 Tags
2906689a299e500740f026f59938c08635e1996f
Commit Graph

3 Commits

Author SHA1 Message Date
sam_oneal 2906689a29 fix: remap unclash.nvim to conflict-free bindings 
Avoid overlapping LSP/diffview keymaps on a new Git > Conflict
(<leader>gx*) group. Navigation stays on ]x/[x.
 2026-09-10 11:16:43 -06:00
sam_oneal 670f6325a1 feat: add merge conflict UI and telescope picker 
- 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
 2026-09-10 11:12:36 -06:00
sam_oneal 3b41bd1552 Added more editor features to support Golang, sql and git 2026-01-19 19:31:11 -07:00