skills.rest
michael-conrad
michael-conradCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-workflow

Enforce trunk-based git workflows across branches, commits, pushes, and PRs.

Updated Apr 24, 2026
Search Tags:#automation#git#workflow#branching#provenance#pull-request#submodules
One-click install
npx skills add https://github.com/michael-conrad/.opencode --skill git-workflow-michael-conrad
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/michael-conrad/.opencode/tree/main/skills/git-workflow
Command: npx skills add https://github.com/michael-conrad/.opencode --skill git-workflow-michael-conrad

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill enforces a disciplined, trunk-based git workflow across branch creation, commits, pushes, PRs, and conflict resolution to prevent unsafe practices on protected branches and ensure auditable, standards-compliant history.

Core Features & Use Cases

  • Enforces squash-only-at-PR creation and prevents commits to main or $DEFAULT_BRANCH.
  • Handles conflict-resolution dispatch, PR state verification, cleanup, and provenance tracking as part of the full workflow.
  • Submodule-aware discipline ensures pointer updates, correct branching, and isolated sub-agent routing for submodule changes.

Quick Start

Tell me to run the git-workflow to enforce a branch/PR discipline on your feature branch.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I enforce trunk-based git workflows across feature branches?▼

Trunk-based git workflows are enforced by preventing direct commits to protected branches, automating squash-on-PR creation, and dispatching conflict resolution. This ensures guarded, auditable changes throughout branch creation, commits, pushes, and PRs.

What is the best way to prevent commits to main or protected branches?▼

Preventing commits to main branches is achieved by enforcing branch creation rules and squash-only merges at PR time. This maintains an auditable, standards-compliant history for your repository.

How do I handle git submodules during a pull request workflow?▼

Git submodule pull request handling requires submodule-aware discipline to ensure pointer updates, correct branching, and isolated sub-agent routing. This isolates submodule changes within the broader workflow.

Can I automate conflict resolution and PR state verification for git branches?▼

Conflict resolution and PR state verification can be automated through dedicated dispatch and state checks. This handles cleanup and provenance tracking, ensuring auditable state verification for protected branches.

Does trunk-based branching work with release flows and provenance tracking?▼

Trunk-based branching applies to both feature and release flows while maintaining provenance tracking. This ensures all changes are auditable and compliant with your automation requirements.

Related Skills

Explore More Software Engineering Skills→
pradeepmoulipradeepmouli
2

speckit-git-initialize

Initialize a Git repository with configurable branch and .gitignore settings.

Community
Intermediate
cosmixcosmix
53

ci-cd

Design and automate CI/CD pipelines for GitHub Actions, GitLab CI, and Jenkins.

Community
Advanced
HuskyDannyHuskyDanny

requesting-code-review

Automate pre-commit code review with static security scanning and auto-fix loops.

Community
Advanced
legioncodeinclegioncodeinc
72

branching-strategy-stinger

Recommend Git branching workflows to reduce merge conflicts.

Official
Advanced