git-conflict.nvim
git-conflict.nvim copied to clipboard
akinsho
Git conflict doesn't show
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 that you recommend on document.
@HungLe14 you should be using tag = "*" I've explained in the README that the main branch is for experimental changes and the tag is for stable releases. Please switch to a stable release.
That's weird because if I use tag = "*" or tag ="v1.*" the plugin installs with the newest changes from the main https://github.com/akinsho/git-conflict.nvim/commit/910dd6cd2056a9353412d29b0b769de06f59f144.
However, If I use tag ="v1.0.0" I get plugin with this HEAD
Is this intended behavior?
@pBorak how tags are resolved is more a question for the package manager author than for me, since I don't control how that is interpreted. If v1.0.0 works for you, then please use that. I don't know why v1.* wouldn't work, but there is definitely only one tag in this project so far. 🤷🏿♂️ essentially main is not yet stable as I'm still working on the directory watcher implementation.
I had the same error and installing with the tag v1.0.0 fixed it. Thanks.
Even after using tag = 'v1.0.0' I cannot get this to work. the conflict markes do not show. Although all commands provided by git-conflict are working, such as :GitConflictNextConflict.
I also tried to using the commit directly but unfortunately same.
env
NVIM v0.8.1
Build type: Release
LuaJIT 2.1.0-beta3
Compiled by [email protected]
So apparently the default highlights are not working. Even after using the setup function it is not using the defined highlighting. After overriding GitConflict... highlight groups it started working. I needed to define those in my theme though.
I too see the same problem and namely that GitConflictListQf does not show the list of different conflicts in the quickfix (rather it defaults to the top of the file): I am using an explicit tag = "v1.1.2" but even using others (1.1.0 as mentioned) I still cannot get it to work. Perhaps there may be conflicts with some other plugins? Is it working fine for you people on the latest tag?
I'm running into an issue using tag = "v1.1.2" where the commands are not found. This used to work for me with v1.0.0 but reverting to that now doesn't seem to fix it.
E492: Not an editor command: GitConflictListQf
I realized this doesn't seem to work with "detached working trees", aka git's worktree feature. Just realized why it only worked for some repos on computer & not other repos after seeing this project gitsigns.nvim specifically mention support for "detached working trees".
Might look into this one day.
