chore: propagate main into development - #92
Merged
Merged
Conversation
Co-authored-by: Jeremy <jhatfield82@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Repo has no root package.json (backend is Go, frontend/package.json is nested), so the "node" release-type was failing on every push to main with "Missing required file: package.json". Switch to "simple", which tracks the version via the manifest file only.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
The nightly -> main promotion PR (#62, merged 2026-08-17) landed on main as a single-parent commit rather than a true two-parent merge, so main's git history never actually linked back to nightly's commit graph even though the tree content matched at the time. Every subsequent nightly -> main diff/merge attempt therefore computed its merge-base against a stale pre-pivot ancestor instead of the real prior promotion point, causing conflicts to balloon across every file touched since. This merges main into nightly favoring nightly's content throughout (main has no content nightly doesn't already have — verified the resulting tree is byte-identical to nightly's pre-merge tree) purely to give main and nightly a shared merge-base going forward, so PR #91 can land as a real merge instead of conflicting. # Conflicts: # codecov.yml # frontend/audit-ci.json # frontend/src/components/MemberCard.tsx # frontend/src/pages/HouseholdPage.tsx
Wikid82
marked this pull request as ready for review
August 24, 2026 21:58
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated PR carrying commits pushed directly to
main(hotfixes, CI-generatedcommits) down into
development. nightly is intentionally skipped — it picksthese up via the daily development sync instead.
Triggered by push aaffad9 to main.