Can it help me resolve merge conflicts?

Yes, it provides structured steps for identifying conflicted files, resolving changes, and completing the merge or rebase process.

What commit message format does this skill use?

It follows the Conventional Commits standard, using types like feat, fix, docs, and refactor to ensure a readable and machine-parsable history.

Does it support interactive rebasing?

Yes, it provides specific guidance on using interactive rebase to squash, reword, or drop commits for a cleaner project history.

Can I use this to debug failed CI/CD runs?

Absolutely. It includes commands to list failed runs, view logs for specific steps, and rerun jobs without leaving the terminal.

Does this skill support the GitHub CLI?

Yes, it fully integrates with the gh CLI to manage pull requests, issues, releases, and repository settings directly.

Git & GitHub Mastery

Name: Git & GitHub Mastery
Author: DiamondLightSource

byDiamondLightSource

0•

Developer Tools

Streamlines version control and GitHub repository management using advanced Git workflows and the GitHub CLI.

This skill empowers Claude to handle complex version control tasks, from structured commit messaging and interactive rebasing to full GitHub lifecycle management. It provides standardized patterns for branch naming, PR creation, issue tracking, and CI/CD debugging using the gh CLI. Whether you are cleaning up commit history, resolving merge conflicts, or managing repository releases, this skill ensures professional best practices are followed consistently across your development environment.

Key Features

01Advanced branch management and interactive rebasing guidance

02CI/CD workflow monitoring and log debugging

03Structured Conventional Commit messaging patterns

040 GitHub stars

05Comprehensive history investigation and conflict resolution tools

06Full GitHub CLI integration for PRs, issues, and project boards

Use Cases

01Performing interactive rebases to clean up commit history before merging

02Automating the creation of detailed Pull Requests and issue reports

03Debugging and rerunning failed GitHub Actions workflows from the terminal

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add diamondlightsource/smartem-devtools git

For use in Claude.ai and ChatGPT

Download Skill