Skip to content

Resolve develop into main merge conflicts

Viet Tan Tran requested to merge feat/resolve-develop-main-conflicts into develop

Created by: ihsraham

Summary

Adds the merge commit that brings main into develop and resolves the conflicts currently blocking PR #138.

Resolution strategy

  • Kept develop as the canonical Fumadocs migration output.
  • Kept migrated content/docs/... and skills/... files from develop.
  • Kept develop deletions for legacy GitBook paths whose migrated replacements already exist.
  • No manual content decisions beyond the previously verified mechanical migration rule.

Validation

  • git merge-tree --write-tree upstream/main HEAD completed without conflicts.
  • npm run build passed.
  • npm run quality was attempted; check:meta passed, then check:links failed on two pre-existing external GitHub release 404s in content/docs/overview/changelog.mdx (pear-wrk-wdk beta.8 and beta.5). The resolution commit has no tree diff versus current develop, so those link failures are not introduced here.

Merge request reports