search

NvChad / base46

NvChad's base46 theme plugin with caching ( Total re-write )
Other
209 stars 204 forks source link

feat: add akinsho/git-conflict.nvim integration #365

Closed daniel-odrinski closed 9 hours ago

daniel-odrinski commented 10 hours ago

I defined new highlight groups here so as not to override the default DiffAdd and DiffText highlight groups.

If there is a way to override these instead, but only for this plugin, I would be happy to update my PR to reflect this, as then it would not require any manual configuration of the plugin.

These highlight groups follow VSCode's way of highlighting conflicts (green and blue).

Thanks.

siduck commented 10 hours ago

add the integration name in your M.base46.integrations field, not the default list!

If there is a way to override these instead, but only for this plugin

i dont think so

daniel-odrinski commented 10 hours ago

Sorry, was following this example, but even I was a little surprised by it: https://github.com/NvChad/base46/pull/364/files

siduck commented 10 hours ago

i missed that, i reverted that file's change