evolve: fix bug in public content divergence merging logic in continue case
requested to merge topic/default/khanchi-bugfix-public-divergence into topic/default/khanchi-cdiv-bugfix
All legacy (hg-git based) Projects have been automatically migrated to native with the upgrade of 2025-01-23