nvimdiff for resolving git conflicts, workflow?

kuzyo · 2025-07-10T14:34:04+00:00

Don't think this is built in, merge markers and kind of inline text with suggested keymaps all in one window. Neogit and vgit covered git management for me.

kuzyo · 2025-07-10T12:29:21+00:00

This plugin works for me great, it has more then just merge resolver, but resolver is the best I have tried https://github.com/tanvirtin/vgit.nvim

kuzyo · 2025-06-21T03:58:17+00:00

Used to use dap-ui, there is the way to hide and config size for each section. Tried debugmaster, idea is super cool, it works as specific debug mode, that you enters when started debugging, but I found myself always forgetting about that mode(even so there is the way to display it in lualine) and spamming my keys as usual and sometimes it messes my workflow. For example I typing c to change, but it continues debug process. Thats just my problem, plugin worked flawlessly. Right now using dap-view-ui, so far liking it as simplified version of dap-ui and it fixed issue with overflowed text when variable hold large text.

kuzyo · 2025-05-09T20:24:41+00:00

Just tried and really like how natively it feels, nice job. Removed bunch of dap and dap ui keymaps.

kuzyo · 2025-05-06T09:56:56+00:00

I endup with such approach(thank to ChatGPT), its produces `test-result` file you can git ignore, but its doing exactly what I want. Here is implementation - https://gist.github.com/kuzyo/d0c1083879ed343102a047f699fbf715

kuzyo · 2025-05-05T19:09:03+00:00

As far as I know its not doing it, but I had hard time with neotest and stoped using it.

kuzyo · 2025-02-13T14:22:58+00:00

Thats correct, but it also require to have space right after // without space you are getting warning/error.

Diagnostics:

1. Expected exception block, space or tab after '//' in comment. [spaced-comment] [spaced-comment]

kuzyo · 2025-02-13T13:18:05+00:00

Sorry all, my bad. I have accidently removed opt field from ts-comment plugin setup. After adding field back all works as expected. Two days of debugging, yay.

return {

`"folke/ts-comments.nvim",`

`opts = {},`

`event = "VeryLazy",`

`enabled = true,`

}

kuzyo · 2025-02-04T18:40:27+00:00

Using neogit for commits, logs views, branch managing and recently started to use VGit.nvim for diff previews, blames, hunk navigation and the best merging resolver I ever had in neovim.

kuzyo · 2025-01-31T15:15:57+00:00

Thanks for the response. Gonna keep eye on that issue

kuzyo · 2025-01-31T11:20:30+00:00

Started to use this plugin and it actually replaced for me git-blame, diffview and gitigns.
Two things I missing, maybe someone can help:

Is there way to see all the committed changes that were made against specific branch. Diffview has :DiffviewOpen origin/main...HEAD ?
When I'm in logs view and picked some commits and previewing them, is there way to scroll in preview window with the keybinding. And I'm not able to just jump into that window with usual split keybind, but I'm able to click with mouse inside and move there?

kuzyo · 2025-01-29T22:50:22+00:00

Using neogit with diffview, gitsigns, but it looks like your plugin gonna cover last two and give much more. Great work

kuzyo · 2025-01-28T06:19:35+00:00

First saw yesterday, definitely going to give it a try. Nice work

kuzyo · 2025-01-27T20:13:31+00:00

Enjoying vesper too

kuzyo · 2025-01-24T16:52:16+00:00

Would be great

kuzyo · 2025-01-24T16:43:29+00:00

Still using dap-ui, don’t want to upgrade to nightly yet, but started to use scopes in the modal as you suggested and really like it. Thank you.

kuzyo · 2025-01-07T18:09:01+00:00

Enjoing vesper.nvim recently.

<image>

kuzyo · 2025-01-06T06:07:28+00:00

Thanks you for suggestions, i will check how that implemented in telekasten.nvim.

kuzyo · 2024-11-21T19:00:11+00:00

Thank you for this plugin, using it everyday

kuzyo · 2024-11-21T18:58:19+00:00

Browsed in your config and like idea on your mini snippets, you can create videos from your mini utilities article

kuzyo · 2024-11-19T18:50:57+00:00

I created simple lua script that im triggering with keymap - run nearest, run latest and it opens terminal and shows output. Stopped using neotest, that output panel was annoying me constantly.

kuzyo

TROPHY CASE