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
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 vim 4, I get an error:
Error in decoration provider git-conflict.win:
Error executing lua: ...ite/pack/lazy/opt/git-conflict.nvim/lua/git-conflict.lua:266: Invalid 'end_row': out of range
stack traceback:
[C]: in function 'hl_range'
...ite/pack/lazy/opt/git-conflict.nvim/lua/git-conflict.lua:266: in function 'highlight_conflicts'
...ite/pack/lazy/opt/git-conflict.nvim/lua/git-conflict.lua:392: in function 'parse_buffer'
...ite/pack/lazy/opt/git-conflict.nvim/lua/git-conflict.lua:471: in function 'process'
...ite/pack/lazy/opt/git-conflict.nvim/lua/git-conflict.lua:660: in function <...ite/pack/lazy/opt/git-conflict.nvim/lua/git-conflict.lua:659>
The text was updated successfully, but these errors were encountered:
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 vim 4, I get an error:
The text was updated successfully, but these errors were encountered: