Resolve git rebase conflicts while preserving commit intent.
npx skills add https://github.com/dupe-com/skills --skill rebased
Please help me install this Agent Skill. Skill: rebased Source: https://github.com/dupe-com/skills/tree/main/skills/rebased Command: npx skills add https://github.com/dupe-com/skills --skill rebased
Manually resolving git rebase conflicts when updating a feature branch against main is time-consuming, error-prone, and often leads to lost code intent if changes are blindly picked from one side. This skill automates the entire rebase workflow while preserving the purpose of all commits.
Ask your AI agent to run the /rebased command to rebase your current branch onto origin/main and automatically resolve any merge conflicts that arise.
High-intent search queries and answers about installing and using this skill.
To automatically resolve git rebase conflicts when updating a feature branch, you can use an intelligent tool that analyzes changes from both branches and merges them semantically to preserve the intent of all commits.
Handling lock file and generated file conflicts during a git rebase is best achieved through automated regeneration, which rebuilds files like bun.lockb, package-lock.json, yarn.lock, and migrations instead of requiring manual hand-merging.
Safely rebasing a branch without losing code intent requires a non-destructive workflow that validates repository state, preserves both upstream and branch changes, and requests explicit user confirmation before executing any force-push operations.
Git rebase conflict resolution tools typically run pre-flight checks to detect dirty working trees, in-progress rebases, or detached HEAD states, ensuring the repository is clean and stable before starting the automated conflict resolution process.
Automated conflict resolution for git workflow synchronization is needed when your feature branch is multiple commits behind the main branch and contains overlapping changes across source code, lock files, and generated migration files that require intent-preserving merges.
open-haxCheck git branch, working tree, remotes, and submodules before destructive operations.
bswrundquistPush local commits to a remote Git repository with safety checks.
ReinaMacCredyMerge origin/main into a local Git branch with guided conflict resolution.
davekilleenUpdate the Dex personal operating system by merging Git repositories and resolving conflicts.
