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

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