Skip to content

docs(contributing): add a git workflow + /pr command#63

Open
bigmistqke wants to merge 2 commits into
solidjs-community:next-cleanupfrom
bigmistqke:docs/contributing-git-workflow
Open

docs(contributing): add a git workflow + /pr command#63
bigmistqke wants to merge 2 commits into
solidjs-community:next-cleanupfrom
bigmistqke:docs/contributing-git-workflow

Conversation

@bigmistqke
Copy link
Copy Markdown
Contributor

@bigmistqke bigmistqke commented Jun 3, 2026

Documents how we keep main/next-cleanup readable — messy branches, clean merges — adds a /pr slash command that drafts a PR following those rules, and makes the repo's tracking match its .gitignore.

What changed

  • CONTRIBUTING.md → new "Git Workflow" section. Codifies the model: branch for every change (never commit to main or a shared solidjs-community/* branch); your own PR branch is yours to force-push/rebase/amend, shared branches are not; one PR = one logical change; squash by default (rebase only when every commit is already a clean, self-contained unit; never merge-commit); the PR title and body are the changelog, since squashing makes the title the commit subject and the description the commit body; and the "fixed points" note on per-commit pkg.pr.new previews. Purely additive — no existing prose changed.
  • .claude/commands/pr.md → new /pr command. Prepares a Conventional-Commit title, a changeset-style body, and a squash-vs-rebase recommendation for the current branch. Text only — it never pushes, force-pushes, or calls gh/the GitHub API. Encodes the same style rules (no hard-wrapping, no Co-Authored-By trailer, match the repo voice) so generated PRs match the documented workflow.
  • Untrack docs/superpowers process artifacts. That tree is gitignored as internal process artifacts (design specs + plans), but six files committed before the ignore rule landed stayed tracked: the three design specs (via feat(xr)!: consumer-owned WebXR — decouple the frame loop from core; add createXR/useXR #62) and three plans (the commit that un-tracked plans lived on a now-deleted branch and never reached next-cleanup). git rm --cached removes all six from the index — files stay on disk — so tracking matches the ignore rule. Repo-hygiene, same theme as the workflow docs.

Test plan

  • Docs + tooling + index-only changes; no source touched, so no unit tests apply.
  • pnpm lint:code lints src/**/*.{ts,tsx} only — Markdown is out of scope, nothing to run.
  • Verified git ls-files docs/superpowers/ is empty after the change; the six files remain on disk (gitignored).

@pkg-pr-new
Copy link
Copy Markdown

pkg-pr-new Bot commented Jun 3, 2026

commit: 0883a45

docs/superpowers is gitignored as internal process artifacts (specs +
plans), but six files committed before that rule landed stayed tracked:
the three design specs (via solidjs-community#62) and three plans (the commit that
un-tracked plans lived on a deleted branch and never reached next-cleanup).
Remove all six from the index (files stay on disk) so tracking matches the
ignore rule.
@bigmistqke bigmistqke force-pushed the docs/contributing-git-workflow branch from d2ad613 to 0883a45 Compare June 3, 2026 12:09
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.

1 participant