chore: merge main into develop to restore a shared ancestor#1064
Conversation
Human v1.0.3
feat: associate with new mitochondrial amino acid importer
…mporter Revert "feat: associate with new mitochondrial amino acid importer"
Human 1.1.2
command: git merge -Xtheirs devel
docs: add new contribs
…mertz add jreimertz as a contributor for bug
…stoff1993 add Christoff1993 as a contributor for bug
main carried every release commit back to v1.1 that develop had never seen, leaving the merge base at a10375c and forcing each release merge to re-reconcile the same divergence. This merge is ancestry only: the resulting tree is identical to develop. All nine conflicts resolve in develop's favour because develop is newer in every case (2.0.1 curation, the Python/RAVEN migration, the published PNAS citation, the 43-contributor list on the six-badge scheme from PR #1049). No deprecated identifiers or contributors are lost; develop is a superset of both lists. main's release artifacts (Human-GEM.xml/.mat/.xlsx/.txt, dependencies.txt, version.txt) are not brought over: increaseHumanGEMVersion generates them on main at release time and develop does not track them.
Model quality report
Each check name links to its explanation in the testResults README. Model checksDuplicate keys (model unloadable) and no growth block the merge; every other row is a non-blocking report.
MACAW and mass/charge balance
Model file and metabolic tasks
MEMOTETotal score: 63.2% (core subset) +43.0 ✅
Per-test scores
Full suite not run for this commit; comment The score above is the fast core subset. Comment Gene essentiality (Hart 2015)Not run automatically (it takes hours). Comment ❌ = a count rose vs the target branch (regression) · Full workflow run · this comment is edited as results come in |
Squashing would discard the second parent and throw away the entire point of this PR. The repo's usual "squash for develop-targeted PRs" convention does not apply here.
What this is
maincarried every release commit back to v1.1 thatdevelophad never seen, so the merge base sat ata10375c4band each release merge had to re-reconcile the same divergence. Mergingdevelopintomaintoday produces 9 conflicts.This is an ancestry-only merge. The resulting tree is byte-identical to
develop: no file changes at all. The only thing that changes is thatmainbecomes an ancestor ofdevelopagain.Payoff
After this lands,
develop->main(#1061) merges with zero conflicts instead of nine.Conflict resolutions
All nine resolve in develop's favour, because develop is newer in every case. Each was checked rather than assumed:
data/deprecatedIdentifiers/deprecatedMetabolites.tsv.all-contributorsrcREADME.md{{nRXN}}placeholders the release fillscitation.cff10.1073/pnas.2516511123vs main's empty doi / "In press".github/workflows/gene-essentiality.ymlcode/test/testMetabolicTasks.mcode/GPRs/updateGrRules.mmodel/Human-GEM.yml,model/metabolites.tsvNo deprecated identifiers and no contributors are lost.
Release artifacts are intentionally not brought over
main'sHuman-GEM.xml/.mat/.xlsx/.txt,dependencies.txtandversion.txtare not merged into develop, which does not track them.increaseHumanGEMVersionregenerates the first five throughexport_for_gitat release time.Note the consequence for the next release: because main becomes an ancestor,
develop->mainfast-forwards and removes those files from main until the release commit puts them back.version.txtis covered by the planned change to pass the version explicitly and create the file when it is absent.