1xbet tr 1xbet tr .

@DesertRose Use a commit before 67ee5aaeb5, which is the one that introduced those files. I think you can use: 262c5c037e, Use promises to fetch net messages

I'm not sure what could happen if you remove them manually. Instead of that I would use git clean to delete untracked files: git clean -fdn To preview what files will be removed, and then: git clean -fd edit: at first glance those are the same files I have problems with some days ago.   After cleaning the untracked files, I would suggest the following steps, which worked for me last time: Check where you are in the commit history: git log --oneline --graph Reset your branch to a known good commit (you just need to pick the right one): git reset --hard <commit> Update your remote branch with your local state: git push --force-with-lease your-remote-repo-name <your-main-branch> Then, update/sync the branch using the Gitea web UI (to avoid Git LFS-related issues). Then, git pull

(I'm not very knowledgeable about this) Those are probably residual changes from when you did git lfs pull. But it got interrupted at the first asset actually in lfs. Just clear them, with git clean -fd should do.  

Can I delete those locally? error: The following untracked working tree files would be overwritten by merge: binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_caryatids.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_decor.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_nature.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_olive_tree.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_props_a.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_roof.xml binaries/data/mods/public/art/actors/props/structures/athenians/erechtheion_tile_c.xml binaries/data/mods/public/art/actors/structures/artifacts/statue_caryatid_medium_pedestal.xml binaries/data/mods/public/art/actors/structures/artifacts/statue_caryatid_small_pedestal.xml binaries/data/mods/public/art/actors/structures/athenians/caryatid.xml binaries/data/mods/public/art/actors/structures/athenians/caryatid_large.xml binaries/data/mods/public/art/actors/structures/athenians/erechtheion.xml binaries/data/mods/public/simulation/templates/gaia/ruins/metal_statue_caryatid.xml binaries/data/mods/public/simulation/templates/structures/athen/erechtheion.xml I certainly didn't change them.