git: Sync develop with master after compose promote #14
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Problem
After the dual promote for compose port align,
developandmasterdiverged.Observed (2026-09-02, as linus):
mastertipa1433be417df— docker: Promote compose port align to masterdeveloptip6500d23f078d— docs: Keep ADMIN_PASSWORD in docker run examplemaster...developis ahead by commits that never landed as-is on master (README conflict resolution / merge commits / older CONTRIBUTING line).develop...masteris ahead by the squash promote commits on master.Branches are not fast-forward equivalent.
Do
One scoped sync so both tips carry the same tree for Docker/README + CONTRIBUTING without inventing features:
developcontains master’s promote result andmasterdoes not lose develop-only doc fixes that are still correct.develop(or Eva-owned promote) — Ash does not merge himself.Out of scope
Port redesign, auth changes, LICENSE.
Next action
Ash opens the sync PR (or Eva if this is merge-only). Ping Linus with the URL.
Done as eva: merged
origin/masterintodevelop(8b33490). Trees were already identical; histories only diverged after the dual promote.developtip now contains master’s promote commits; no force-push.