You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
get_git_root(fn.fnamemodify(api.nvim_buf_get_name(buf), ':h'), function(git_root)
get_conflicted_files(git_root, function(files, repo)
vim.print(files)
forname, binpairs(visited_buffers) do
And the output of a not working git repo output this:
{
["Using Node for alias legacy"] = {}
}
This output is because I am using fnm and the repo directory contains a .nvmrc file which make fnm automatically choose node version base on it's content.
I successfully managed to repro this issue in a demo repo with follow steps:
cd /tmp && mkdir conflict && cd ./conflict
try to create a simple conflict file like conflicted-file.txt inside the conflict folder, I will pass those steps.
create a .nvmrc file with content legacy.
Install fnm.
fnm alias v16.0.0 legacy, note: the node version doesn't matter.
every time you cd into this directory, a message will show: Using Node for alias legacy.
nvim conflicted-file.txt.
NVIM v0.10.0-dev-779+gfdb11888f
git-conflict.nvim: v1.1.2
The text was updated successfully, but these errors were encountered:
I added following debug code to
git-conflict.lua
:And the output of a not working git repo output this:
This output is because I am using fnm and the repo directory contains a
.nvmrc
file which make fnm automatically choose node version base on it's content.I successfully managed to repro this issue in a demo repo with follow steps:
cd /tmp && mkdir conflict && cd ./conflict
conflicted-file.txt
inside theconflict
folder, I will pass those steps..nvmrc
file with contentlegacy
.fnm alias v16.0.0 legacy
, note: the node version doesn't matter.Using Node for alias legacy
.nvim conflicted-file.txt
.NVIM v0.10.0-dev-779+gfdb11888f
The text was updated successfully, but these errors were encountered: