Skip to content

Merge develop into main

Viet Tan Tran requested to merge develop into main

Created by: ihsraham

Summary

Merges develop into main.

Current Status

  • Conflict resolution PR #139 has been merged into develop.
  • GitHub now reports this PR as MERGEABLE.
  • Docs Quality Gates passed on the updated develop head.
  • Local no-worktree merge simulation now completes without conflicts:

git merge-tree --write-tree upstream/main upstream/develop

Resolution Notes

The conflicts were resolved mechanically by preserving the Fumadocs migration output on develop and deleting legacy GitBook paths whose migrated replacements already exist. Private pear-wrk-wdk release links were converted to plain version text so link checks do not attempt public access to private release URLs.

Fetched refs checked

  • main: d7bd22081f0f0462ff2ccc1d8a463270677accb9
  • develop: c3f7946008ab96f73569b3b0c79a409fe14d612e

Merge request reports