fix: resolve merge conflicts + cockpit iframe URL + stale references#61
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
blove
force-pushed
the
claude/blissful-bartik
branch
from
9844d50 to
b2d4086
Compare
2 tasks
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.
Summary
Critical fixes:
Merge conflict markers from PR feat: generative UI views system — views() API + chat integration + planning example #57 squash merge — 12 files had unresolved
<<<<<<< HEADmarkers that broke all builds. Resolved by keeping the HEAD versions (with views integration).Cockpit iframe URL — cockpit.cacheplane.ai shows DEPLOYMENT_NOT_FOUND because the iframe loads from the old
examples.stream-resource.devdomain. Added hardcoded fallback toexamples.cacheplane.aiin content-bundle.ts.Stale stream-resource references — Updated 4 GitHub URLs in Nav/Footer, 2 LLM template URLs, and 1 example env project name.
Test plan
stream-resourcereferences in source code