git

Automate git repository operations with conflict resolution and conventional commits.

Updated Aug 23, 2026
One-click install
npx skills add https://github.com/CuongTran69/tramthientra --skill git-cuongtran69
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git
Source: https://github.com/CuongTran69/tramthientra/tree/main/.augment/skills/git
Command: npx skills add https://github.com/CuongTran69/tramthientra --skill git-cuongtran69

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill streamlines and safeguards common Git repository operations, reducing manual error and uncertainty during commits, pulls, pushes, merges, and rebases while providing structured conflict resolution and conventional commit guidance.

Core Features & Use Cases

  • Comprehensive Operations: Run status, commit, pull, push, merge, rebase, log, and changelog workflows with pre-flight checks and clear previews.
  • Safe Conflict Resolution: Auto-resolve trivial conflicts, group non-trivial conflicts by domain, present trade-offs, and require human confirmation before applying destructive changes.
  • Conventional Commits & Backups: Analyze staged changes to produce conventional commit messages automatically, tag backups before risky operations, and warn about force pushes.
  • Use Case: Prepare a feature branch for push by staging changes, generating a conventional commit, fetching remote changes, previewing incoming commits, and safely merging with human-reviewed conflict decisions.

Quick Start

Ask the git skill to generate a conventional commit for the staged changes, run pre-flight checks, and pull remote updates with conflict-safe handling.

Frequently Asked Questions about git

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

FAQPage Schema
How do I automate git merge conflict resolution safely?

Git conflict resolution can be automated by auto-resolving trivial conflicts, grouping non-trivial conflicts by domain for human review, and requiring confirmation before applying destructive changes. Backup tags are created before risky operations to safeguard repository state.

How do I generate conventional commit messages for staged git changes?

Conventional commit messages are generated by analyzing staged changes automatically. This workflow enforces conventional commit standards while preparing feature branches for push, reducing manual error and ensuring consistent version control history.

Can I run git rebase workflows with pre-flight checks and backup tags?

Git rebase workflows support pre-flight checks, clear previews, and backup tags before execution. These safeguards reduce uncertainty during rebasing operations across branches and remotes, ensuring structured conflict resolution throughout the process.

What's the best way to prepare a feature branch for a safe git push?

Preparing a feature branch for push involves staging changes, generating a conventional commit, fetching remote updates, previewing incoming commits, and safely merging with human-reviewed conflict decisions to prevent destructive errors.

Why does git force push trigger a warning during automated workflows?

Git force push triggers warnings because it is a destructive action that can overwrite remote history. Automated workflows require explicit human confirmation before executing force pushes to protect repository integrity and prevent data loss.

Does this git workflow support changelog generation across multiple branches?

Changelog generation is supported across branches and remotes as part of comprehensive git operations. The workflow includes status, commit, pull, push, merge, rebase, and log operations with pre-flight checks and structured previews.