Resolve git rebase conflicts while preserving branch changes.
npx skills add https://github.com/haryelramalho/skills --skill git-rebase-haryelramalho
Please help me install this Agent Skill. Skill: git-rebase Source: https://github.com/haryelramalho/skills/tree/main/skills/curated/git-rebase Command: npx skills add https://github.com/haryelramalho/skills --skill git-rebase-haryelramalho
This Skill helps you rebase branches without losing work, turning conflict-heavy history cleanup into a controlled, recoverable process.
Use this skill to safely rebase your current feature branch onto the latest main branch while preserving your changes and resolving conflicts with confidence.
High-intent search queries and answers about installing and using this skill.
To resolve git rebase conflicts safely, you can create backup branches before rebasing and use validation heuristics to analyze conflicted files. This preserves your feature branch changes while ensuring a clean linear history.
The best way to rebase a drifted feature branch is choosing between squash-first, interactive, or simple rebase strategies based on commit count. This manages multi-commit history cleanup and resolves repeated conflicts on collaborative codebases.
Git rebase replays your commits onto the target branch for a linear history, whereas merge creates a merge commit. Using rebase with validation checks and backup branches prevents losing work during complex conflict resolution.
Yes, you can safely force-push after an interactive rebase by running validation checks to verify clean merges. Safe force-push guidance ensures your cleaned multi-commit history updates the remote without overwriting remote changes.
When git rebase conflicts repeat across multiple commits, use conflict analysis heuristics and bundled scripts to inspect conflicted files. Backup branch creation allows quick recovery if the repeated resolution attempts fail.
You need to create a backup branch before rebasing when your feature branch has drifted far from main and faces complex merge conflicts. This safe recovery step ensures you can quickly recover if the rebase fails.
cacr92Merge the current Git branch into main and prune all other branches.
cacr92Merge a feature branch into main and clean up branches and worktree.
latestaiagentsResolve Git merge conflicts by analyzing branch differences and common ancestors.
eumemicOrchestrate git commits, pushes, pull requests, CI monitoring, and merges.
