skills.rest
tsukhani
tsukhaniCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git

Manage Git repository operations including commits, branching, rebasing, and conflict resolution.

12|3|Updated Apr 6, 2026
Search Tags:#git#collaboration#version control#repository#merge#rebase
One-click install
npx skills add https://github.com/tsukhani/jclaw --skill git-tsukhani
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git
Source: https://github.com/tsukhani/jclaw/tree/main/skills/git
Command: npx skills add https://github.com/tsukhani/jclaw --skill git-tsukhani

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This skill eliminates the complexity and risk associated with manual Git operations, preventing common errors like accidental history overwrites, lost work, and broken repository states.

Core Features & Use Cases

  • Safe Version Control: Provides standardized commands for branching, merging, and rebasing that prioritize data integrity.
  • History Recovery: Offers clear, step-by-step instructions for using reflog and reset to recover from mistakes.
  • Team Collaboration: Implements best practices for pull requests, conflict resolution, and commit hygiene to ensure smooth team synchronization.

Quick Start

Use the git skill to safely rebase your current feature branch onto the latest main branch and resolve any resulting conflicts.

Frequently Asked Questions about git

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

FAQPage Schema
How do I safely rebase a feature branch without losing commits?▼

Safe rebasing without losing commits requires using Git commands that prioritize non-destructive history manipulation and data integrity. This approach standardizes branching operations to prevent accidental overwrites while synchronizing your feature branch.

What is the best way to resolve merge conflicts during team collaboration?▼

Resolving merge conflicts during team collaboration involves applying Git best practices for pull requests and commit hygiene. This standardized approach ensures smooth synchronization and clear repository history inspection across the development workflow.

How do I recover lost work or undo a bad commit in a Git repository?▼

Recover lost work or undo a bad commit in a Git repository by using reflog and reset operations. These provide step-by-step history recovery instructions to safely restore previous repository states and prevent data loss.

Does this approach support standardized commit message formatting for pull requests?▼

Yes, this Git workflow supports standardized commit message formatting for pull requests. It implements team collaboration best practices to ensure commit hygiene, clear history inspection, and smooth repository synchronization across development workflows.

When should I avoid manual Git operations to prevent breaking repository states?▼

Avoid manual Git operations during complex version control tasks like rebasing or merging to prevent accidental history overwrites, lost work, and broken repository states. Use standardized workflows instead to ensure safe history manipulation.

Related Skills

Explore More Software Engineering Skills→
aztr0nutzsaztr0nutzs
2

git-sync

Commit and push local workspace changes to a remote GitHub repository.

Community
Intermediate
nsheapsnsheaps
3

update-branch

Synchronize feature branches with their PR base using git and gh.

Community
Advanced
santanapolsantanapol

commit-push-with-changelog

Enforces CHANGELOG.md updates and confirms pushes before executing git commits.

Community
Intermediate
twikustwikus
3

merge

Merge Git branches with context-aware conflict resolution using GitHub CLI.

Community
Intermediate