Provide exact Git commands and workflows for branching, merging, and conflict resolution.
npx skills add https://github.com/rar-file/surf --skill git-expert-rar-file
Please help me install this Agent Skill. Skill: Git Expert Source: https://github.com/rar-file/surf/tree/main/skills/git_expert Command: npx skills add https://github.com/rar-file/surf --skill git-expert-rar-file
Git workflows and conflicts often derail development; this Skill provides precise commands, workflows, and guidance to navigate branching, merging, and history edits.
Describe a Git scenario (e.g., branching strategy, conflict resolution, or history rewriting) and I will provide the exact commands to execute along with explanations.
High-intent search queries and answers about installing and using this skill.
Resolve git merge conflicts by identifying conflicting files, editing the code to combine changes, staging the resolved files with git add, and committing the merge. This Skill provides exact commands alongside pre- and post-state checks to ensure no data is lost during conflict resolution.
Git rebasing rewrites branch history to maintain a linear project timeline, while merging preserves the complete historical branch topology. This Skill explains the purpose and side effects of each approach to help you choose the right branching and merging strategy.
Yes, you can safely undo git commits using common rescue and safe undo patterns. This Skill warns about destructive operations, suggests safe approaches for history rewriting, and outlines pre- and post-state checks to prevent accidental data loss.
Use git interactive rebase to squash multiple commits by selecting a base commit, choosing squash for target commits, and saving the rebase todo list. This Skill provides step-by-step commands for interactive rebase and history rewriting workflows.
Yes, this git workflow guidance applies to daily development tasks across both solo and team projects. It covers branching strategies, cherry-picking, and stashing, providing precise commands and workflows tailored to your specific project scale and context.
Manage git submodules and worktrees by using specific commands to initialize nested repositories and link multiple working directories to a single repository. This Skill provides exact commands for submodules, hooks, and worktree automation to streamline parallel development.
0xRayAIAutomate Git branching, merging, and repository synchronization workflows.
yaronshererAutomate Git commits, pushes, and GitHub Actions CI monitoring with auto-fixes.
winsorllcAutomate Git operations for commits, branches, and remote synchronization.
schpetGuide Jujutsu (jj) workflow commands for status, diff, commit, and push operations.
