Skip to content

docs: example LazyVim configuration #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
acovaci wants to merge 1 commit into
base: main
Choose a base branch
from
Open

docs: example LazyVim configuration #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,39 @@ vim.keymap.set('n', ']x', '<Plug>(git-conflict-next-conflict)')

</details>

<details><summary>example LazyVim key configuration</summary>

```lua
return {
{
"akinsho/git-conflict.nvim",
event = "BufReadPre",
opts = {
default_mappings = false,
},
keys = {
{ "<leader>gco", "<Plug>(git-conflict-ours)", desc = "Choose Ours" },
{ "<leader>gct", "<Plug>(git-conflict-theirs)", desc = "Choose Theirs" },
{ "<leader>gcb", "<Plug>(git-conflict-both)", desc = "Choose Both" },
{ "<leader>gc0", "<Plug>(git-conflict-none)", desc = "Choose None" },
{ "]x", "<Plug>(git-conflict-next-conflict)", desc = "Next Conflict" },
{ "[x", "<Plug>(git-conflict-prev-conflict)", desc = "Previous Conflict" },
{ "<leader>gcq", "<cmd>GitConflictListQf<cr>", desc = "Conflicts to Quickfix" },
},
},
{
"folke/which-key.nvim",
opts = {
spec = {
{ "<leader>gc", group = "conflict" },
},
},
},
}
```

</details>

## API

This plugin exposes an API to extract some of the data it collects for other
Expand Down