"Merge main back to staging" step fails

[EmileSonneveld]

https://github.com/eu-cdse/documentation/actions/runs/22669501463/job/65709634102

Auto-merging .github/workflows/pr-publish.yml
Auto-merging .github/workflows/production-publish.yml
Failed to merge submodule APIs/openEO/openeo-community-examples (not checked out)
CONFLICT (submodule): Merge conflict in APIs/openEO/openeo-community-examples
Auto-merging Applications/Browser.qmd
Auto-merging Data/Others/Sentinel1_COG.qmd
CONFLICT (content): Merge conflict in Data/Others/Sentinel1_COG.qmd
Auto-merging Quotas.qmd
Auto-merging Support.md
CONFLICT (content): Merge conflict in Support.md
Auto-merging _quarto.yml
CONFLICT (content): Merge conflict in _quarto.yml
Automatic merge failed; fix conflicts and then commit the result.

The difference seems 1000+ conflicts: publish...main

(Difference with staging is 600+ conflicts: staging...main)

[EmileSonneveld]

https://github.com/eu-cdse/documentation/actions/runs/22669501485/job/65709634139
"Merge main back to main" step fails too:

Switched to a new branch 'main'
branch 'main' set up to track 'origin/main'.
Already up to date.
Auto-merging Data/SentinelMissions/Sentinel1.qmd
CONFLICT (content): Merge conflict in Data/SentinelMissions/Sentinel1.qmd
Automatic merge failed; fix conflicts and then commit the result.

The difference seems 400+ commits: publish...main