Skip to content

feat: import blog from another repo#4675

Merged
ruf-io merged 6 commits intomainfrom
andy/blog-repo
May 5, 2026
Merged

feat: import blog from another repo#4675
ruf-io merged 6 commits intomainfrom
andy/blog-repo

Conversation

@ruf-io
Copy link
Copy Markdown
Collaborator

@ruf-io ruf-io commented Mar 25, 2026

No description provided.

@vercel
Copy link
Copy Markdown

vercel Bot commented Mar 25, 2026 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
neon-next Ready Ready Preview, Comment May 5, 2026 0:40am

Request Review

@americano98 americano98 mentioned this pull request Apr 6, 2026
Merged
@ruf-io
Copy link
Copy Markdown
Collaborator Author

ruf-io commented Apr 17, 2026

@copilot resolve the merge conflicts in this pull request

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 17, 2026

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflict in package.json. The prebuild and predev scripts now combine both the blog's fetch-blog-content.js from this branch and the check:content-data + generate:pricing additions from main (commit d1c0f11).

@americano98
feat: add source-aware blog preview flow (#4725)
3ef36f0 
* feat(utils): add source-aware blog content flow

# Conflicts:
#	.env.example
#	package-lock.json
#	package.json
#	src/components/pages/blog/blog-grid-item/blog-grid-item.jsx

* feat(pages): add branch preview routes for blog

* fix(utils): support legacy markdown heading anchors

* fix: envs, revalidate

* chore: draft skills

* fix: double 404 layout

* chore: lock, hr

* chore: ui adjustments

* chore: search adjustments

* fix: concurrency loading, add retry

* chore(styles): svg scroll, blockqoute

* chore: adjustments, undo render limits

* chore: review adjustments

* chore: update lock, add preview layout

* chore: remove wp classes

* chore: end the wordpress era

* fix: make blog content source lint-compatible

* fix: preserve blog featured ordering, align blog preview
@ruf-io
Copy link
Copy Markdown
Collaborator Author

ruf-io commented Apr 28, 2026

@copilot resolve the merge conflicts in this pull request

@ruf-io
fix: resolve merge conflict with main branch
2243a7b 
Co-authored-by: ruf-io <11527560+ruf-io@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 28, 2026

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflict in .gitignore. Both branches had added content/blog — kept our version with the explanatory comment (commit 2243a7b).

@ruf-io
Copy link
Copy Markdown
Collaborator Author

ruf-io commented May 5, 2026

@copilot resolve the merge conflicts in this pull request

@ruf-io
fix: resolve merge conflict with main (check:pricing-sync)
295251a 
Co-authored-by: ruf-io <11527560+ruf-io@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented May 5, 2026

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflict in package.json. The prebuild and predev scripts now combine the blog bootstrap step from this branch with main's updated check:pricing-sync (which replaced generate:pricing) — commit 295251a.

Copilot finished work on behalf of ruf-io May 5, 2026 12:37
@ruf-io ruf-io merged commit b30d415 into main May 5, 2026
2 checks passed
@ruf-io ruf-io deleted the andy/blog-repo branch May 5, 2026 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ruf-io @americano98