Skip to content

docs: add fork contribution workflow to CONTRIBUTING.md - #219

Merged
bradygaster merged 2 commits into
bradygaster:devfrom
williamhallatt:williamhallatt/218-contributing-fork-workflow
Mar 7, 2026
Merged

docs: add fork contribution workflow to CONTRIBUTING.md#219
bradygaster merged 2 commits into
bradygaster:devfrom
williamhallatt:williamhallatt/218-contributing-fork-workflow

Conversation

@williamhallatt

Copy link
Copy Markdown
Contributor

Closes #218

Summary

Five gaps in CONTRIBUTING.md identified during PR #217 (contributing from a fork). This PR fixes them all.

Changes

Getting Started — Fork-First Workflow

Replaced the bare git clone instruction with a full 4-step fork setup: fork on GitHub → clone fork → add upstream remote → fetch upstream dev.

New: Keeping Your Fork in Sync

Added a subsection explaining how to rebase on upstream/dev before opening or updating a PR.

Pull Request Process

  • Added changeset as Step 1 (required before PR — was previously easy to skip)
  • Updated push command to use the contributor's username
  • Replaced generic gh pr create with explicit base/head: gh pr create --base dev --repo bradygaster/squad --head {yourusername}:branch

Branch Strategy

Updated bradygaster/dev description from "Brady's integration branch (team usage)" to "Integration branch. All PRs from forks must target this branch, not main".

Kobayashi charter + history (team-internal)

  • Charter: added permanent Fork Contributor Procedure section so the Git & Release agent always knows the correct fork PR flow
  • History: recorded the three specific mistakes from today and their fixes

)

Closes bradygaster#218

Five gaps identified during PR bradygaster#217 contribution from a fork:
- Fork-first setup instructions in Getting Started
- PR process now specifies --base dev and explicit --head
- Changeset added as a required step in the PR checklist
- Branch Strategy: bradygaster/dev clarified as PR target for all contributions
- New 'Keeping Your Fork in Sync' section with rebase instructions

Also captures fork procedure in Kobayashi's charter (permanent procedure)
and history (lessons from today's session).
Rewrote 'Fork Contribution Procedure' entry to contain only
reusable procedural knowledge — removed PR numbers, dates, and
'what went wrong' narrative. Kept all actionable commands.
@bradygaster
bradygaster merged commit 157b8c0 into bradygaster:dev Mar 7, 2026
1 check failed
@williamhallatt
williamhallatt deleted the williamhallatt/218-contributing-fork-workflow branch March 7, 2026 01:27
bradygaster added a commit that referenced this pull request Mar 7, 2026
Session: 2026-03-07T01-13-00Z-phase2-complete
Requested by: Brady

Changes:
- Merged 3 inbox decisions (Kobayashi PR merges, Keaton community PRs, Fenster template fix)
- Logged orchestration results for all 3 agents (Kobayashi, Keaton, Hockney)
- Logged Phase 2 session completion
- Appended Phase 2 results to agent history files (cross-agent updates)
- Deduplicated: No duplicate decisions found; all 3 inbox items were new.

Merges completed:
- PR #232: Scribe runtime state fix (86598f4)
- PR #212: Version stamp preservation (0fedcce)
- PR #230: CLI wire-up squad link + squad init --mode remote (6d0bd56)
- PR #217: TUI /init no-args flow fix (20970f9)
- PR #219: Fork contribution workflow docs (157b8c0)

Test results: 130/134 test files passing. 12 pre-existing failures in consult, REPL, status, acceptance modes. Core CLI solid.
jongio pushed a commit to jongio/squad that referenced this pull request Mar 9, 2026
* feat(cli): add deprecation notice to GitHub-native distribution (bradygaster#219)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* test: add edge-case coverage for SDK distribution resolution (bradygaster#180)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jongio pushed a commit to jongio/squad that referenced this pull request Mar 9, 2026
…ster#219)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jongio pushed a commit to jongio/squad that referenced this pull request Mar 9, 2026
* feat(cli): add deprecation notice to GitHub-native distribution (bradygaster#219)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* chore: bump to v0.6.0 for production release (bradygaster#216)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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