skills.rest
pascallammers
pascallammersCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Manage Git branching, committing, merging, rebasing, and conflict resolution.

1|Updated Sep 26, 2025
Search Tags:#git#workflow#collaboration#version control#commit#branching
One-click install
npx skills add https://github.com/pascallammers/mylo-travel-concierge-v2 --skill git-workflow-pascallammers
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/pascallammers/mylo-travel-concierge-v2/tree/main/.factory/skills/git-workflow
Command: npx skills add https://github.com/pascallammers/mylo-travel-concierge-v2 --skill git-workflow-pascallammers

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill streamlines your version control process, ensuring efficient collaboration, clean commit history, and effective conflict resolution.

Core Features & Use Cases

  • Branching Strategies: Implement Feature Branch, Gitflow, or Trunk-Based Development.
  • Commit Conventions: Enforce standards like Conventional Commits for clear history.
  • Conflict Resolution: Provides clear steps to resolve merge conflicts.
  • History Management: Offers tools for rebasing, squashing, and cherry-picking commits.
  • Use Case: When working on a new feature, you can use this skill to create a dedicated branch, make commits with descriptive messages, and then rebase your branch onto the latest main branch before creating a pull request.

Quick Start

Use the git-workflow skill to create a new feature branch named 'my-new-feature'.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I resolve Git merge conflicts during collaborative development?▼

Git merge conflicts are resolved using clear steps provided by this Skill to identify conflicting changes, edit files to reconcile differences, and finalize commits for a clean traceable history.

What is the best way to manage Git branching for a new feature?▼

The best way to manage Git branching is implementing Feature Branch, Gitflow, or Trunk-Based Development patterns to isolate new features before merging them back into the main branch.

How do I keep a clean Git commit history with rebasing and squashing?▼

Git commit history is kept clean using history management tools for rebasing branches onto the latest main branch and squashing commits to ensure a descriptive traceable log.

Does this workflow support enforcing Conventional Commits standards?▼

Yes Git workflow supports enforcing Conventional Commits standards to maintain a clear and structured commit history across collaborative software development environments.

Can I cherry-pick specific commits from one branch to another?▼

Yes you can cherry-pick specific commits using the history management capabilities of this Skill to apply targeted changes from one branch onto another for precise source control operations.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
vstorm-covstorm-co
1.0k

git-workflow

Manage git commits, branches, pull requests, and conflict resolution.

Official
Intermediate
chriscarteruxchriscarterux

quick-check

Run build and test scripts, check handlers, and report git status.

Community
Basic
larsnyglarsnyg

git-workflow

Manage Git branching, merging, and conflict resolution workflows.

Community
Advanced