Skip to content

Resolve PR #1 merge conflict: apply README enrichment, exports fix, and CI/CD on current main#3

Merged
logan676 merged 2 commits intomainfrom
copilot/fix-pr1-merge-conflict
Feb 27, 2026
Merged

Resolve PR #1 merge conflict: apply README enrichment, exports fix, and CI/CD on current main#3
logan676 merged 2 commits intomainfrom
copilot/fix-pr1-merge-conflict

Conversation

Copy link
Contributor

Copilot AI commented Feb 17, 2026

PR #1 (copilot/enhance-homepage-content) became unmergeable after PR #2 landed on main, both touching README.md. This branch rebases PR #1's changes onto current main.

Changes

Pre-existing test failure in style-injector.test.ts (column-width vs column-count) is unrelated.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

…I/CD workflows

Apply changes from PR #1 on top of current main (post-PR #2):
- README.md: badges, feature table, quick start, architecture, contributing guide + Design doc reference
- package.json: move types before import/require in exports
- .github/workflows/ci.yml: lint + build + test matrix (Node 18/20/22)
- .github/workflows/release.yml: npm publish with provenance on v* tags

Co-authored-by: logan676 <2975850+logan676@users.noreply.github.com>
Copilot AI changed the title [WIP] Fix merge conflict in PR #1 Resolve PR #1 merge conflict: apply README enrichment, exports fix, and CI/CD on current main Feb 17, 2026
Copilot AI requested a review from logan676 February 17, 2026 15:41
@logan676 logan676 marked this pull request as ready for review February 18, 2026 00:29
@logan676 logan676 merged commit d3ea807 into main Feb 27, 2026
4 of 7 checks passed
@logan676 logan676 deleted the copilot/fix-pr1-merge-conflict branch February 27, 2026 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants