git-conflict.nvim
git-conflict.nvim copied to clipboard
akinsho
A plugin to visualise and resolve merge conflicts in neovim
Hi there, at first, I just want to thank you for this plugin! Great work! I have a quick question about the plugin behavior - it doesn't work in YAML...
I really like this plugin, only thing I wish it has would be some util functions Choose ours/theirs/both for the entire file. The use case is, I had a `yarn.lock`...
In many cases, it is not enough to have local, remote, and merge states. It may also be necessary to see the base state. When I send these states to...
This PR solves issue #34 by allowing the "Choose ..." mappings to be called in visual mode and resolving the conflicts in the visual range with the given choice Though...
Hi @akinsho, i can't get confilct code when using :GitConflictListQf. When i merge code then i have many conflict code but can't get it via plugin. I was followed configuration...
When the conflict is very big and I scroll out of the conflict markers, git-conflict stops highlighting those areas. It should still highlight areas even when conflict markers are not...
fixes #72 This flags allows user to choose the default colors over highlight colours(even if the highlight group is detected)
Hello, I have been using the `git-conflict.nvim` plugin and it has been a great addition to my development process. However, I have noticed a potential area for improvement concerning the...
It would be great if there was a command to choose whichever hunk (ours or theirs) is currently under the cursor. Thanks for developing this awesome plugin 🚀
When I am in a running neovim instance and a git conflict appears on a buffer that is already open, the conflict markers are shown but not highlighted. Even after...