@DesertRose Ok, your remote now looks good. So instead of git pull try doing this: git fetch git clean -fd git reset --hard origin/main. This should remove those files and bring you an exact copy of your remote repo

For Map Filter you can also select "All Maps" in case you don't remember to which group the map you are looking for belongs  (Default, Naval Maps, Demo Maps, Best for MP, Trigger Maps)

@guerringuerrin You caught me in an edit

@DesertRose Great. Now: git push --force-with-lease you-remote-repo-name <your-repo-main-branch>

$ git reset --hard 262c5c037e   HEAD is now at 262c5c037e Use promises to fetch net messages   $ git push --force-with-lease origin main   Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0) remote: remote: Create a new pull request for 'main': remote: https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork/pulls/new/main remote: remote: . Processing 1 references remote: Processed 1 references in total To https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork.git + 19fe52f328...262c5c037e main -> main (forced update)   Sync Fork on gitea   $ git pull   From https://gitea.wildfiregames.com/DesertRose/0ad-DR_fork 262c5c037e..19fe52f328 main -> origin/main Updating 262c5c037e..19fe52f328 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 Please move or remove them before you merge. Aborting