ge-aerospace/shopdb-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Branch model corrections: wilm is an active sibling branch

Browse Source 
Also stops wj-status offering to promote work that already landed.
This commit is contained in:
Cameron Proudlock
2026-08-30 12:50:18 -04:00
parent 43fed63277
commit 3c50efab60
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CONTRIBUTING.md
View File

@@ -153,9 +153,15 @@ Tests are required for:
## Branches: what belongs on main, and what does not ## Branches: what belongs on main, and what does not
Two branches. `main` is the product every site runs and the publication mirror `main` is the product every site runs and the publication mirror exports.
exports. `<site>` branches - currently `wj` - hold work that is not ready for `<site>` branches hold work that is not ready for other sites to see. There are
other sites to see. two: `wj` here, and `wilm` on the corporate GitHub, where the other site
develops the .NET endpoint agent.
A site branch is not a fork. Both feed `main`, and the sooner they do it the
cheaper it is. A branch the dev box cannot see is still a branch: `wilm` is not
visible from here because this machine has no GitHub account, which is why
`fetch-wilm-branch.cmd` on the share exists to bring it back for review.
**Most work is product.** ADR-015 gives site differences three homes on `main`: **Most work is product.** ADR-015 gives site differences three homes on `main`:
a setting with a neutral default, seed data, or a site-namespaced directory a setting with a neutral default, seed data, or a site-namespaced directory
@@ -188,10 +194,9 @@ quietly becomes the product.
**The failure to watch for is not what you think.** Promoting something **The failure to watch for is not what you think.** Promoting something
site-specific by accident is caught by the ADR-015 gate on the way into `main`. site-specific by accident is caught by the ADR-015 gate on the way into `main`.
The real risk is product work sitting on a site branch forever because nobody The real risk is product work sitting on a site branch until bringing it back is
decided - which is how the `wilm` branch stopped being a merge and became a a port rather than a merge - one such round trip cost a MySQL dialect fix, a
port, costing a MySQL dialect fix, a contract violation and a plugin install to contract violation and a plugin install.
bring back.
So rebase the site branch on `main` often, and promote as you go rather than in So rebase the site branch on `main` often, and promote as you go rather than in
one batch at the end. one batch at the end.