skills.rest
Fujigo-Software
Fujigo-SoftwareOFFICIAL
Explore all skills by this author →
GitHub

git

Standardize Git workflows with branching, PRs, merges, and conflict resolution.

24|8|Updated Feb 4, 2026
Search Tags:#git#branching#workflows#code-review#pull-requests#version-control#merge-conflicts
One-click install
npx skills add https://github.com/Fujigo-Software/f5-framework-claude --skill git-fujigo-software
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git
Source: https://github.com/Fujigo-Software/f5-framework-claude/tree/main/plugins/f5-core/skills/git
Command: npx skills add https://github.com/Fujigo-Software/f5-framework-claude --skill git-fujigo-software

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Uncoordinated Git workflows often lead to merge conflicts, miscommunication, and stalled releases; this Skill provides structured guidance, best practices, and templates to standardize Git usage across teams.

Core Features & Use Cases

  • Fundamentals: basic commands, branching, and history management.
  • Workflows: GitFlow, GitHub Flow, trunk-based development, and feature branches.
  • Collaboration: PRs, code review, merge conflicts, and remote management.
  • Advanced Techniques: rebasing, cherry-picking, interactive rebase, hooks, and merge strategies.
  • Templates & References: comprehensive examples and reference material to accelerate onboarding.

Quick Start

Begin by inspecting the SKILL.md at the git skill root and start adopting the Git workflows and templates in your project.

Frequently Asked Questions about git

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

FAQPage Schema
What is the best way to standardize Git workflows across a development team?▼

Structured Git workflows standardize collaboration by applying models like GitFlow or trunk-based development. This enforces consistent branching, pull request, and merge processes to prevent miscommunication, merge conflicts, and stalled releases.

How do I resolve merge conflicts when collaborating on a shared Git repository?▼

Resolving merge conflicts requires standardized collaboration practices and clear remote management. Applying structured code review templates and defined merge strategies helps identify and systematically fix conflicting code changes.

What are the differences between GitFlow, GitHub Flow, and trunk-based development?▼

GitFlow uses distinct branches for features, releases, and hotfixes. GitHub Flow is a simpler, branch-based workflow with continuous deployment. Trunk-based development integrates changes into a single main branch frequently to ensure rapid delivery.

How do I use interactive rebase and cherry-picking for advanced version control?▼

Advanced version control uses interactive rebase to rewrite commit history and cherry-picking to apply specific commits across branches. These techniques refine merge strategies and maintain a clean project history.

When should I use rebasing instead of merging in Git?▼

Rebasing rewrites commit history to create a linear project timeline, while merging preserves the exact history with merge commits. Rebasing is preferred for cleaner local histories, while merging is best for integrating shared remote changes.

Do I need specific Git hooks to enforce code review before merging pull requests?▼

Git hooks automate workflow enforcement by running scripts before or after lifecycle events. Using pre-receive or pre-merge hooks ensures pull requests pass automated checks and code reviews before changes integrate into main branches.

Related Skills

Explore More Software Engineering Skills→
giosuetedeschi-specgiosuetedeschi-spec

git-pushing

Automate git staging, committing, and pushing to remote repositories.

Community
Basic
tachfineamnaytachfineamnay

Git Workflow & CI/CD

Standardize Git workflows and CI/CD pipelines with Husky and GitHub Actions.

Community
Intermediate
htayjhtayj

code-review

Analyze code diffs for bugs, security risks, and maintainability issues.

Community
Intermediate
mdmagnuson-creatormdmagnuson-creator

merge-conflicts

Merge target branches into source branches and resolve pull request conflicts.

Community
Advanced