06dba9a4ad
- Add branch naming convention: type/scope/short-description - Update gitea-push skill: branch guard in Step 1 (never commit to main) - Update rules-mcp-builder: create branch before any MCP build - Update rules-bigmind: create branch before any BigMind task - Update rules-homelab: create branch before any homelab task - Add Section 11 to REPO_STRATEGY.md: full branching strategy doc (types, scopes, workflow, Lumen responsibilities, examples) - Ticketing decision: Gitea Issues only, no Docker ticketing service
3.6 KiB
3.6 KiB
name, description
| name | description |
|---|---|
| gitea-push | Commits and pushes code to the homelab Gitea server using conventional commit format. Use this skill when finishing any homelab, MCP builder, or BigMind work that needs to be saved to the homelab Gitea at http://192.168.188.119:30008/. |
Gitea Push
When to use
- Finished a homelab change and need to commit + push
- Finished an MCP server build or update
- BigMind feature complete
When NOT to use
- ADP/Paisy work — that goes to the corporate Bitbucket, not homelab Gitea
- Uncommitted work that isn't ready (don't push broken state)
Inputs required
- A description of what changed (for commit message)
- The type of change (see conventional commit types below)
- The scope (e.g.,
mcp-webscraper,bigmind,homelab-docker) - The working branch name (or "main" — but you should NOT be on main)
Branch Convention
Never commit directly to main. Every piece of work lives on its own branch.
Format: type/scope/short-description
| Type | When |
|---|---|
feat |
New feature, server, or tool |
fix |
Bug fix |
docs |
Docs, plans, strategy files |
chore |
Refactoring, config, CI, build |
spike |
Experimental / throwaway exploration |
Scope = the affected project area: bigmind · webscraper · cannamanage · workshop · roo · plans
Examples:
feat/bigmind/people-contactsfix/bigmind/health-check-bugsdocs/plans/cannamanage-strategychore/workshop/monorepo-reorganize
Workflow
-
Check current branch — branch guard (MANDATORY):
git branch --show-current- If already on a correct feature branch → continue to step 2
- If on
main→ STOP. Create a branch first:git checkout -b feat/scope/short-description - Never commit to
main. Not even for "tiny fixes".
-
Check status:
git status git diff --stat -
Stage changes:
git add -A # or selectively: git add path/to/file -
Write conventional commit message:
Format:
type(scope): short descriptionType When featNew feature or tool fixBug fix refactorCode restructure, no behavior change testAdding or updating tests docsDocumentation only choreBuild, dependencies, config styleFormatting, no logic change Examples:
feat(mcp-webscraper): add ssl cert fallback with certififix(bigmind): resolve FTS5 reserved-word collisionchore(homelab): update docker-compose for gitea upgrade
-
Commit:
git commit -m "type(scope): description" -
Push branch to Gitea:
git push origin feat/scope/short-descriptionGitea URL:
http://192.168.188.119:30008/pplate/pi_mcps.git -
Merge to main when done:
git checkout main git merge --no-ff feat/scope/short-description git push origin mainOr use the Gitea UI merge button if you want the paper trail.
-
Store fact in BigMind:
memory_store_fact("codebase", "Committed: type(scope) — brief description of what changed")
Troubleshooting
- Auth error: PAT stored in BigMind (fact: Gitea personal access token). Check
~/.netrcor~/.gitconfig - Push rejected: Pull first →
git pull --rebase origin main - Wrong remote:
git remote -vto verify Gitea URL is set correctly - Accidentally committed to main:
git branch feat/scope/name,git reset HEAD~1,git checkout feat/scope/name, re-commit