Repository navigation
🗄️🧹 [SSC-8] Merge SSG-254 into consolidation branch (5/5, final) - #235
Merged
Gizmotronn merged 1275 commits intoSep 17, 2026
Merged
Conversation
…izing issue with annotation missions
🎗️❄️ ↝ [SSG-141 SSG-125]: Making worlds (Part 2)
…ow have feature parity
💒🎭 ↝ [SSM-150]: Classify Pipeline Improvments
… author fields for gen
… and P4) have been added
…d into the structure page
…s/structure inventory dictionary
…malies fetching to add new fallback
🐬💥 ↝ [SSG-244]: New structure layout & deploy modals
…new annotator/structure form
…ing dialogue & mission ideation for collaborative exploration of anomalies/classifications, new milestones for this week
🚔🛞 ↝ [SSG-251]: Secondary Structure Signals
…ew structure viewports
…pe anomalies are fetched/classified with update/link between next/post dynamic routes
… main ts viewport component
…ns for telescope blocks
…ggling through the new templating layer
… SSM-240]: New referral system & okayish layout for structures
… SSG-260 SSM-240]: Little bit of styling, fixing planet generator painting
Clean auto-merge, no conflicts. Completes folding all 6 dead branches (master, sta-19-route-authentication-parameters-from, GP-14-Test-out-alchemy-type-crafting-minigame, SSG-2, SSG-218, SSG-254) into a single scratch branch, ready for their deletion.
Gizmotronn
commented
Sep 17, 2026
Gizmotronn
left a comment
Gizmotronn
left a comment
Member
Author
There was a problem hiding this comment.
That's the last one
Gizmotronn
merged commit Sep 17, 2026
b64dea1
into
archive/dead-branch-consolidation
0 of 4 checks passed
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
1 participant
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.
Step 5 of 5, final: merges SSG-254 into the scratch consolidation branch. Clean merge, no conflicts. Once merged, archive/dead-branch-consolidation contains everything from all 6 dead branches (master, sta-19-route-authentication-parameters-from, GP-14-Test-out-alchemy-type-crafting-minigame, SSG-2, SSG-218, SSG-254), which can then be deleted. Part of SSC-8.