git-essentials

To resolve a git merge conflict during a rebase, you identify conflicting files, manually edit them to accept the desired changes, stage the files, and continue the rebase. This skill guides you through resolving conflicts and cleaning up history safely.

The best way to undo a pushed git commit is using the revert command to create a new commit that inverses the changes, or reset if the branch is private. This skill provides exact recovery steps for undoing mistakes across local and remote repositories.

To sync your local repository without losing uncommitted work, you stash your changes, fetch and pull the remote updates, and then pop the stash back. This skill covers stashing work in progress and remote synchronization workflows.

Yes, you need the git command-line tool installed and available in your environment, because this skill requires it for deterministic repository management. It provides command guidance and workflow support based on that underlying tool.

To branch from main and tag a release commit, you create a feature branch, commit your fixes, and apply an annotated tag to the specific commit hash. This skill helps manage repository setup, branching, and tagging for release preparations.