git

Re: Stable Diffusion/kohya_ss/ComfyUI

When you see this:

error: Your local changes to the following files would be overwritten by merge...
...Please commit your changes or stash them before you merge.
Aborting

Do this:

git fetch --all
git reset --hard
git pull