git-helper

Interactive rebase lets you clean up commit history before a pull request by squashing, reordering, or editing commits. This Skill guides you through the rebase process step by step to ensure your branch history is atomic and clear.

Resolving merge conflicts during a Git rebase requires identifying conflicting changes, manually editing the files, and staging the resolutions. This Skill provides practical examples for safe conflict resolution and continuing the rebase.

Git branching strategies like GitFlow and Trunk-Based Development differ in release management and branch longevity. This Skill explains and contrasts these workflows to help you choose the right strategy for your team's collaboration needs.

You can recover lost commits in Git using the reflog to find dangling history and restore deleted branches. This Skill covers advanced recovery techniques to safely retrieve and manage lost version control data.

Conventional Commits standardize commit messages to ensure atomic, clear project history and facilitate automated tooling. This Skill enforces commit best practices to help you maintain efficient and readable code management.

Git cherry-pick applies specific commits from one branch to another without merging the entire history. This Skill explains advanced operations like cherry-pick and when it is safer than a full branch merge for isolated changes.