Skip to content

docs: resolve merge conflicts in CONTRIBUTING.md (fixes #654)#663

Open
clubanderson wants to merge 2 commits into
projectbluefin:mainfrom
clubanderson:resolve/issue-654
Open

docs: resolve merge conflicts in CONTRIBUTING.md (fixes #654)#663
clubanderson wants to merge 2 commits into
projectbluefin:mainfrom
clubanderson:resolve/issue-654

Conversation

@clubanderson
Copy link
Copy Markdown

Resolves the merge conflict between main and the docs/contributing-guide branch (PR #650) in CONTRIBUTING.md.

Neither version was dropped — the resolved file combines unique content from both branches:

From main: testing section (Vitest + Playwright navbar visual tests), security issues note, i18n locale naming convention.

From PR #650: detailed intro note redirecting OS contributors to upstream repos, richer prerequisites table, HMR note + commands reference table, full repository structure diagram, Making Changes section, detailed ESLint rules, DCO sign-off instructions, conventional commit examples, Questions section.

Closes #654
Refs #650

ci-maintainer and others added 2 commits May 24, 2026 21:53
- Add prerequisites table (Node.js 18+, npm, optional just)
- Add local development setup steps
- Add repository structure section with component map
- Add code style / ESLint formatting guidance
- Add PR workflow with DCO sign-off instructions
- Add conventional commit examples
- Retain pointer to docs site and OS-image repos

Addresses: guide bead 27949a40 — CONTRIBUTING.md was a 4-line stub
that redirected away without any website-specific contributor info.

Signed-off-by: ci-maintainer <ci-maintainer@projectbluefin.hive>
Merge content from docs/contributing-guide (PR projectbluefin#650) into main,
combining unique content from both branches:

- Detailed intro note directing OS contributors to upstream repos
- Richer prerequisites table (version + purpose columns)
- Hot-module-replacement note in local dev section
- Commands reference table
- Full repository structure diagram with multi-page app explanation
- Making Changes section (content, components, translations)
- Detailed ESLint rules (indent, quotes, banned console.log)
- DCO sign-off instructions and commit convention examples
- Testing section (Vitest unit + Playwright navbar visual tests)
- Security issues note
- Questions section (Discord, Discussions, issues)

Closes projectbluefin#654
Refs projectbluefin#650

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: GitHub Copilot <copilot@github.com>
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jun 4, 2026

Warning

Review limit reached

@clubanderson, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 44 minutes and 12 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: c6d83521-b819-4cbe-b973-7fc1d114f42f

📥 Commits

Reviewing files that changed from the base of the PR and between b88c145 and dd6640b.

📒 Files selected for processing (1)
  • CONTRIBUTING.md
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

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.

resolve: merge conflicts in CONTRIBUTING.md — PR #650

1 participant