search

zbirenbaum / copilot-cmp

Lua plugin to turn github copilot into a cmp source
MIT License
1.08k stars 39 forks source link

Can no longer update from repo #14

Closed Jesspu closed 2 years ago

Jesspu commented 2 years ago

Hey, I recently tried to update (Packer Sync), and the packer update failed repeatedly.

After some digging, it seems like there was maybe a rebase of the main branch, which packer did not like. So, I went to the repo directory in packer, and tried to do `git pull --allow-unrelated-histories, so I could update from the main branch.

However, the auto merge failes

Auto-merging lua/copilot_cmp/init.lua
CONFLICT (add/add): Merge conflict in lua/copilot_cmp/init.lua
Auto-merging lua/copilot_cmp/source.lua
CONFLICT (add/add): Merge conflict in lua/copilot_cmp/source.lua
Automatic merge failed; fix conflicts and then commit the result.

Do I just need to uninstall and reinstall this plugin?

zbirenbaum commented 2 years ago

That's interesting, as I haven't run into any problems like that.

Just rm -rf the copilot-cmp directory wherever packer installs it, then packersync again. It should be this by default: ~/.local/share/nvim/pack/packer/{start or opt}/copilot-cmp

Jesspu commented 2 years ago

That fixed it, thanks.