Resolves git rebase conflicts in feature branches via guided marker resolution.
npx skills add https://github.com/bmsull560/Fabric_4L --skill jr-rebase
Please help me install this Agent Skill. Skill: jr-rebase Source: https://github.com/bmsull560/Fabric_4L/tree/main/.windsurf/skills/jr-rebase Command: npx skills add https://github.com/bmsull560/Fabric_4L --skill jr-rebase
Resolve git rebase conflicts in feature branches to maintain a clean, linear history.
Start by running git status to identify conflicts, resolve each conflicting file by editing the conflict markers, stage the resolved files with git add, and continue the rebase with git rebase --continue until the process completes.
High-intent search queries and answers about installing and using this skill.
To resolve git rebase conflicts in a feature branch, run git status to identify conflicts, edit files to remove conflict markers, stage resolved files with git add, and run git rebase --continue until the process completes with a clean history.
For multi-commit rebases with upstream conflicts, use workflow templates that guide marker navigation and hunk selection step-by-step, allowing you to merge or discard changes with minimal disruption to feature work.
Git rebase conflict markers visually delineate mismatches between HEAD and incoming changes, enabling guided conflict detection so you can understand differences and select, merge, or discard conflicting hunks accurately.
You should rebase a feature branch onto an unmerged upstream branch to maintain a clean, linear history, applying workflow templates to resolve any resulting merge conflicts and complete the rebase.
Yes, you can discard conflicting hunks during a git rebase by following step-by-step guidance for selecting, merging, or discarding mismatches, ensuring minimal disruption to your feature work while maintaining clean history.
A git rebase stops at conflicts when mismatches occur between branches; complete it by resolving markers, staging files with git add, and executing git rebase --continue until all conflicts are resolved and the rebase finishes.
yash-gargResolve in-progress git merge and rebase conflicts by analyzing changes and completing integration workflows.
bennybennisonEnforce consistent git commit messages and clean branch history.
saint2706Manage Git workflows for commits, branches, merges, and conflict resolution.
jMertaRebase the current branch onto a target branch with conflict triage guidance.
