Skip to content
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.

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

feature: git-conflict #663

Open
1 task done
ADIX7 opened this issue Dec 14, 2024 · 0 comments
Open
1 task done

feature: git-conflict #663

ADIX7 opened this issue Dec 14, 2024 · 0 comments
Labels
enhancement New feature or request

Comments

@ADIX7
Copy link

ADIX7 commented Dec 14, 2024

Did you check the docs?

  • I have read all the tokyonight.nvim docs

Is your feature request related to a problem? Please describe.

Add akinsho/git-conflict.nvim plugin. The default colors looks way of
kép

Describe the solution you'd like

Please add some colors for the highlight groups. I changed the colors based on VSCode, but I'm sure you can find much more appealing colors.
kép

Describe alternatives you've considered

I used these colors

vim.api.nvim_set_hl(0, "GitConflictCurrent", { bg = "#25403B"  })
vim.api.nvim_set_hl(0, "GitConflictIncoming", { bg = "#25394B" })
vim.api.nvim_set_hl(0, "GitConflictAncestor", { bg = "#282828" })

with this config:

{
    "akinsho/git-conflict.nvim",
    version = "*",
    opts = {
        disable_diagnostics = true,
        highlights = {
            current = "GitConflictCurrent",
            incoming = "GitConflictIncoming",
            ancestor = "GitConflictAncestor",
        },
    },
},

Additional context

No response

@ADIX7 ADIX7 added the enhancement New feature or request label Dec 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

1 participant