Update issue

[finite rivet]

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Command '"A:\text-generation-webui\installer_files\conda\condabin\conda.bat" activate "A:\text-generation-webui\installer_files\env" >nul && git pull --autostash' failed with exit status code '128'

This is the message I am getting while I am trying to update the oobabooga windows ,

[lime blade]

When things have been modified on the main directory, it can do that.
Sometimes it can be hard to troubleshoot.
Not saying this is the best solution but doing a clean install has always worked for me.
I just save models/logs/characters folders before doing that