Repository navigation
merge: consolidate portfolio redesign branches - #6
Merged
Merged
Conversation
Resolve the alternative redesign and older improvement branch in favor of the validated multi-page field-notes implementation. cursor-building and newww are already ancestors of main and therefore already included.
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
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.
Summary
codex/personal-field-stationredesign and oldercodex/portfolio-improvementshistory as merged without reintroducing their conflicting or superseded files.cursor-buildingandnewww, which were already ancestors ofmainand therefore already present.Branch comparison
codex/field-notes-portfolio: complete multi-page redesign, defensive project rendering, SEO files, and passing static checks. Selected implementation.codex/personal-field-station: competing single-page redesign with 1,961 lines of separate CSS and 535 lines of JavaScript; its redirect-only subpages and overlapping implementation were not layered over the selected site.codex/portfolio-improvements: older diverged documentation and placeholder cleanup, superseded by the selected content.cursor-building: zero commits ahead ofmain; already absorbed.newww: zero commits ahead ofmain; already absorbed.Resolution
The merge commit uses the exact tested tree from
codex/field-notes-portfoliowhile preserving all divergent redesign branches as reachable history. No content was silently combined when doing so would reintroduce dead cursor code, redirect-only pages, duplicate stylesheets, or conflicting data schemas.Verification
python scripts/validate_site.pynode --check js/main.jsnode --check js/projects.jsMerge intent
This PR is intended to replace the separate redesign branches with one consolidated result. Merge only after the static workflow succeeds.