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

Having this problem some days ago I did this and it worked

That I keep asking you to test out with me, yet you never do 

Hello, the mod is now available on mod.io and through the mod downloader. In the future refrain from using 0ad>=0.28.0 as it causes issues (You cannot guarantee what will happen in the future)