mirror of
https://github.com/freemkv/libfreemkv.git
synced 2026-10-07 18:13:10 +00:00
chore(qa-sync): absorb qa's post-1.7.5 release commits into dev
Same fix as the other 7 repos: qa held two release-orchestrate commits (v1.7.5 bump + post-release freemkv-unlock path restore) that never propagated back to dev, so promote's fast-forward gate refused. Ours-merge records qa as an ancestor without applying its content; dev has already moved past 1.7.5 to 1.7.6.
This commit is contained in: