Git Workflow

Download SKILL.mdGet Murage How skills work

Open source. macOS, Windows and Linux.

At a glance

What it is

Git workflow expert covering branching strategies, commit conventions, interactive rebase, merge vs rebase, conflict resolution, git bisect, hooks, monorepo strategies, and CI integration.

A skill is a written procedure a bot loads when a job calls for it. This one is a single file, SKILL.md, and the whole file is on this page.

File: SKILL.md
Length: 499 lines2,093 words, about 10 min read
Category: Software engineeringdeveloper tools
Level: Intermediate
License: Apache-2.0

Teams that use this skill.

Dev ShopFrom a clear spec to reviewed code and a release ready for your approvalA team of 6 bots

Each of these library teams gives its bots this skill. Import one and look inside first.

More software engineering skills.

The full skill.

The whole file, exactly as it downloads. Read it before you rely on it.

SKILL.md

499 lines · 2,093 words

Download

Git Workflow

You are an expert in Git workflows. Design and execute Git strategies that keep history clean, enable collaboration, and support CI/CD. Git is a tool for communication between developers across time. Every commit, branch, and merge tells a story.

Branching Strategies

Trunk-Based Development (Recommended for Most Teams)

main ─────●─────●─────●─────●─────●─────●─────
           \   /       \   /       \   /
            ●           ●           ●
        (short-lived feature branches, < 2 days)

Put this skill to work.

Questions.

What is the Git Workflow skill?

Git workflow expert covering branching strategies, commit conventions, interactive rebase, merge vs rebase, conflict resolution, git bisect, hooks, monorepo strategies, and CI integration.

How much does it cost?

Nothing. It ships with Murage, which is open source. Your bots run on the AI plan you already have.

Can I change it?

Yes. Open it in Settings → Skills to read, edit or duplicate it. Skill Guard scans it again after every edit.

Give your first job to Murage.

Download the app, connect the AI you already pay for, and tell your Chief of Staff what needs doing. Plan on about ten minutes from install to a working team.

Download Murage

No account needed · Runs on the AI plan you already pay for

main ─────●─────●─────●─────●─────●─────●───── \ / \ / \ / ● ● ● (short-lived feature branches, < 2 days)

Factor	Trunk-Based	GitHub Flow	GitFlow
Release frequency	Continuous	Daily-weekly	Scheduled
Team size	Any	Small-medium	Medium-large
CI/CD maturity	High	Medium	Any
Feature flags	Required	Optional	Not needed
Complexity	Low	Low	High

Type	When
`feat`	New feature
`fix`	Bug fix
`docs`	Documentation only
`style`	Formatting, missing semicolons (not CSS)
`refactor`	Code change that neither fixes a bug nor adds a feature
`perf`	Performance improvement
`test`	Adding or correcting tests
`build`	Build system or external dependency changes
`ci`	CI configuration changes
`chore`	Other changes that do not modify src or test files

Situation	Use
Updating a personal feature branch with latest main	Rebase
Merging a feature branch into main	Merge (or squash merge)
Shared branch with multiple contributors	Merge (never rebase shared branches)
Cleaning up local commits before PR	Interactive rebase
Preserving detailed development history	Merge
Creating a clean, linear history	Rebase + merge

Command	Effect
`pick`	Keep the commit as-is
`reword`	Keep the commit but change the message
`edit`	Stop at this commit to amend it
`squash`	Fold into previous commit, combine messages
`fixup`	Fold into previous commit, discard this message
`drop`	Remove the commit entirely
`reorder`	Change the order of commits by moving lines

Hook	Runs when	Use for
`pre-commit`	Before commit is created	Lint, format, type check
`commit-msg`	After message is written	Validate commit message format
`pre-push`	Before push to remote	Run tests, prevent force push to main
`prepare-commit-msg`	Before editor opens	Populate template
`post-merge`	After merge completes	Install deps, run migrations
`post-checkout`	After branch switch	Install deps, clear caches

Git Workflow

Teams that use this skill.

More software engineering skills.

The full skill.

Git Workflow

Branching Strategies

Trunk-Based Development (Recommended for Most Teams)

Put this skill to work.

Questions.

Give your first job to Murage.

Search murage.ai

Git Workflow

Teams that use this skill.

More software engineering skills.

The full skill.

Git Workflow

Branching Strategies

Trunk-Based Development (Recommended for Most Teams)

Put this skill to work.

Questions.

Give your first job to Murage.

Create a bot and use this skill.

Ask Ember to create the bot

Open the bot’s skills

Find Git Workflow and switch it on

Ask the bot for the job

About this skill.

GitHub Flow

GitFlow

When to Use Which

Commit Message Conventions

Conventional Commits

Types

Examples

Commit Message Rules

What Makes a Good Commit

Merge vs Rebase

Merge

Rebase

Decision Framework

Squash Merge

Interactive Rebase

Rebase Commands

Conflict Resolution

Process

Conflict Markers

Reducing Conflicts

Git Bisect

Automated Bisect

Git Hooks

Useful Hooks

Managing Hooks with Tools

lint-staged Configuration

Monorepo Git Strategies

Sparse Checkout

Shallow Clone

CODEOWNERS

CI Integration

Branch Protection Rules

CI Pipeline Triggers

Optimizing CI for Git

Essential Git Commands

Recovery Commands

Investigation Commands

Cleanup Commands

When to Use

Output Format

Example

Edge Cases