skills.rest
devbasex
devbasexOFFICIAL
Explore all skills by this author →
GitHub

ndf-policies

Defines branch strategy and PR operation policies for NDF development workflows.

1|Updated Apr 21, 2026
Search Tags:#pull request#git workflow#cherry-pick#branch strategy#environment branches#project policies
One-click install
npx skills add https://github.com/devbasex/ai-plugins --skill ndf-policies-devbasex
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: ndf-policies
Source: https://github.com/devbasex/ai-plugins/tree/main/plugins/ndf/skills/ndf-policies
Command: npx skills add https://github.com/devbasex/ai-plugins --skill ndf-policies-devbasex

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve? Teams working across environment branches (qa/staging/release) often create inconsistent fixes, polluted feature branches, and tangled merge histories. This Skill provides a single authoritative reference of NDF project policies so developers have clear decision criteria when unsure how to handle branching, cherry-picking, and PR operations. ## Core Features & Use Cases - Branch Operation Principles: Five core rules covering cherry-pick-first fixes to environment branches, prohibiting environment-branch merges into feature branches, syncing the base branch before pushing, and avoiding chained reverts. - Branch Contamination Prevention: Explicit rules that keep environment-specific code out of feature-to-main PRs. - Skill Migration Reference: Documents the rename of /ndf:safe-refactoring to /ndf:refactoring and removal of legacy v7.0.0 migration tables. - Use Case: When a hotfix must reach qa, staging, and release branches, consult this policy to confirm the fix is committed on the feature branch first and delivered via cherry-pick rather than direct edits. ## Quick Start Ask the AI to check the NDF policies for the correct way to apply the same fix to qa, staging, and release branches.

Frequently Asked Questions about ndf-policies

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I apply the same fix to qa, staging, and release branches?▼

Commit the fix on the feature branch first, then cherry-pick it to each environment branch. Never commit directly to short-lived branches and re-implement on feature, as that causes duplicated work and inconsistencies.

Can I merge an environment branch into a feature branch to resolve conflicts?▼

No. Merging environment branches into feature branches is prohibited even for conflict resolution, because it introduces environment-specific code into the feature-to-main PR and pollutes the branch.

What should I do before pushing a short-lived branch?▼

Pull in the originating base branch before pushing. The base is defined in .ndf/worktree.json as base_branch and may differ from the default branch, and CI workflows require the latest base.

What happened to the safe-refactoring command in NDF?▼

It was renamed to /ndf:refactoring in v8.0.0 and the old name was removed in v9.0.0. Arguments and procedures are unchanged; the integrated perspectives live in references/data-representation.md.

When should I create a new branch instead of pushing to a merged one?▼

Never push to an already-merged branch. Check the existing PR status, and if merged, create a new branch with a -v2 or -v3 suffix and open a new PR.

Related Skills

Explore More Software Engineering Skills→
HomericIntelligenceHomericIntelligence
18

worktree-cleanup

Remove merged or stale Git worktrees to free disk space.

Official
Intermediate
takemi-ohamatakemi-ohama

branch-fix-strategy

Commit fixes on a feature branch and cherry-pick them to environment branches.

Community
Advanced
takemi-ohamatakemi-ohama

cherry-pick-pr

Create a cherry-pick pull request from a feature branch to a base branch.

Community
Intermediate
PixelMLPixelML
12

agenticflow-mcp

Attach MCP clients to AgenticFlow agents for external data access.

Official
Advanced