All Activity

Oh really? That explains some of my difficulties. :-/ I am still missing the "Endpoint (gg)" one, though.

Ok, but it looks like you’re making progress now. Check where your LFS URL is pointing, bc it looks like it is missconfigured because: So, check the LFS URL endpoints with: git lfs env And check for the Endpoint values: They should look like this (note they are none of them are pointing to my remote but official repo instead): If you see bad urls here you can: git lfs uninstall git lfs install git config lfs.url https://gitea.wildfiregames.com/0ad/0ad.git/info/lfs git lfs pull If this pull still fails you can try: GIT_LFS_SKIP_SMUDGE=1 git pull git lfs pull Now, I’m not entirely sure how GIT_LFS_SKIP_SMUDGE works internally besides that it basically skips downloading LFS files during pull, but it has helped me before when I had issues updating my local repo due to LFS errors.

Now git-lfs makes issues again: Updating files: 100% (57/57), done. Downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (101 KB) Error downloading object: binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e69): Smudge error: Error downloading binaries/data/mods/public/art/meshes/props/caryatid.dae (4758e699101e3ab0b367bc4557a5fe155b395df3a28d3c3ecc3c5d7bb4b45565): batch request: ssh: Could not resolve hostname https: Name or service not known: exit status 255 Errors logged to '/home/tre/git/0ad/0ad-DR_fork/.git/lfs/logs/20260321T163051.234002216.log'. Use `git lfs logs last` to view the log. error: external filter 'git-lfs filter-process' failed fatal: binaries/data/mods/public/art/meshes/props/caryatid.dae: smudge filter lfs failed Tried this: https://wildfiregames.com/forum/topic/135018-git-lfs-issues/

That would indeed be a marvellous upgrade path!

@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

git reset --hard 262c5c037e should do the work

They come right back, those little @#&#036;%s.

@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.

Works great! Thank you!

Map Type: Random Map Filter: Default

@DesertRose Can you show what the output of git log --oneline is? edit: I guess for your edit that you managed to fix it. nice!

None of those work. It seems because I merged branches with the main repo it cannot be undone so simply. edit: git reflog git reflog --relative-date The second command is very helpful to make it more clear that the order is chronically DESCENDING. -.-

When I checked for the unusual high sniping activity I came to the conclusion that its a auto-clicker. There are a lot of games where this is prohibited and reason for bans. It's definitely the case that some players are using such mice and see no harm in it and it's the case that some players would like that such mice/features were not used. I don't like the current balance where one is incentivized to target the ranged units at the back (because they have less armor and deal much damage). Besides that, even if the balance were changed to my liking and melee were a high priority target, I think the feature of the target area could still be beneficial in situations. To take out healers, elephants, heroes or so. I think "sniping upgrade" could be a interesting upgrade. That doesn't upgrade any stat. but how well the army acts together in later games. Upgrade 1: Target the unit which requires the least amount of attacks within your range Upgrade 2: Be aware of where the other soldiers shoot and don't shoot more arrows on a unit than necessary. I know some game that had these as upgrades. Should be priced high though, as they are quite valuable.

Apologies for what may be an idiot newbie question. I searched the forums but found no answer. I only play using "Single Player --> Matches". I like digging around in the available maps, and found one that I liked ("Wild Lake"), and played that several times. Then played other maps. But now I cannot find "Wild Lake" again. I assume I am filtering wrong. Any hints? Thanks.

And, if dropping your commits doesn’t work for some reason, you can also try resetting your local branch to a few commits earlier in the history. Then try steps 2 and 3 again. View the history to choose where to go with: git log --oneline Then: git reset --hard <commit-hash> Then:

Ah, you edited the main branch of your repo.... The classical workflow would be to not make any of your edits there but on dedicated branches. Assuming we still want to use your main to rebase all local branches --since @guerringuerrin confirmed this worked for him, I'm guessing this was indeed due to something, probably rights, preventing you to pull lfs assets from 0AD's main repo storage-- here is what you could do: Drop all commits you did on main locally Force push your own main branch Try again to sync your main with 0AD's main using the web UI

Trying to sync in the web UI gives me this error message: Merge Failed: There was a conflict while merging. Hint: Try a different strategy. And all fixes for it I found are for conflicts with the same repo, not with a parent repo. A comment similar to git merge upstream/main doesn't seem to exist for git-lfs