Instruction file imported from snotani/Agent-OS (
.cursor/rules/git.mdc). Copyright stays with the author.
Git Workflow
Branching
- All work happens on branches — never commit directly to
main. - Branch naming:
feature/OB-<number>-<short-description> - The Linear ticket number (
OB-<number>) must be provided before a plan is finalized. - Every plan must include the Linear ticket number and target branch name.
Commits
- Message format:
<type>(OB-<number>): <one-line description> - Types:
feat(feature),fix(bug fix),chore(maintenance/config/docs) - Small, descriptive commits with separation of concerns — minimal files per commit.
- Never commit without user approval. Before committing, present:
- Files staged / added
- What was done (high-level)
- Exact commit message(s)
- Wait for explicit "go ahead"
Pushing
- Never push without user approval. Present what will be pushed, wait for confirmation.
- Before any push, verify
git config user.emailiss.notani@outlook.com. Set repo-local if not. - Never force-push to
main.
Pull Requests
- After pushing, ask the user if they are ready to create a PR and merge to
main. - Only create the PR and merge after explicit user approval.
- Do not delete feature branches after merging.
- After merging, switch back to
main, pull latest, and signal "ready for next task". - Always add labels to PRs. Use at least one of:
enhancement,bug,documentation,chore.
Plan Finalization Gate
- A plan is NOT ready for implementation without both:
- Linear ticket number (e.g.
OB-6) - Branch name (e.g.
feature/OB-6-agents-setup)
- Linear ticket number (e.g.