Skip to content

docs(contributing): enforce ff-only main and branch-first workflow#9282

Closed
dymaxionlab wants to merge 2 commits into
NousResearch:mainfrom
dymaxionlab:docs/git-workflow-policy-v2
Closed

docs(contributing): enforce ff-only main and branch-first workflow#9282
dymaxionlab wants to merge 2 commits into
NousResearch:mainfrom
dymaxionlab:docs/git-workflow-policy-v2

Conversation

@dymaxionlab

Copy link
Copy Markdown

What does this PR do?

Adds explicit Git workflow policy to keep updates simple and low-risk:

  • main is clean + fast-forward only
  • branch-first development (no work on main)
  • rebase-first sync for active branches
  • multi-machine handoff protocol
  • conflict-resolution protocol

Also updates PR checklist to enforce these expectations.

Related Issue

Fixes #

Type of Change

  • 📝 Documentation update

Changes Made

  • Updated CONTRIBUTING.md with required Git workflow policy and protocols
  • Updated website/docs/developer-guide/contributing.md with same policy
  • Updated .github/PULL_REQUEST_TEMPLATE.md checklist with ff-only/rebase hygiene checks

How to Test

  1. Open updated docs and verify policy sections are present
  2. Open PR template and verify new checklist items are present
  3. Confirm no code behavior changes (docs-only)

Checklist

  • I've read the Contributing Guide
  • My commit messages follow Conventional Commits
  • My PR contains only related changes
  • I've run pytest tests/ -q and all tests pass (N/A docs-only)

Add prioritized Git workflow policy to CONTRIBUTING and website docs.\nDefine multi-machine sync protocol, pull/update protocol, and conflict\nresolution expectations.\n\nTighten PR template checklist to enforce non-main development, ff-only\nmain updates, and rebase-before-merge hygiene.
@dymaxionlab

Copy link
Copy Markdown
Author

this was made in error

@dymaxionlab dymaxionlab reopened this Apr 14, 2026
@dymaxionlab

Copy link
Copy Markdown
Author

Closing after updating head branch to no-op against main.

jankadlecek added a commit to jankadlecek/hermes-agent that referenced this pull request May 24, 2026
OpenAI's "Enable device code authorization for Codex" toggle in ChatGPT
Settings is broken/missing for many account types since early 2026
(openai/codex NousResearch#9253, NousResearch#9282, NousResearch#9327, NousResearch#9418). Hermes dashboard's KEYS →
Codex LOGIN button uses device code internally, so it fails out of the
box. Local `codex login` uses PKCE with a localhost callback and is
unaffected, so let the operator do that login on their Mac and ship
the resulting tokens to the container via a base64 env var.

The bootstrap runs once when CODEX_AUTH_JSON_B64 is set AND the Hermes
auth store does not yet exist on the volume. It writes both the Codex
CLI shared file and the Hermes auth.json with active_provider set to
"openai-codex", so Hermes's auto-detect picks Codex without needing
any further dashboard interaction.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.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.

1 participant