Rebase a Git branch onto a base branch with conflict resolution and safe pushing.
npx skills add https://github.com/Apostolos-Delis/Dotfiles --skill rebase-apostolos-delis
Please help me install this Agent Skill. Skill: rebase Source: https://github.com/Apostolos-Delis/Dotfiles/tree/main/.agents/skills/rebase Command: npx skills add https://github.com/Apostolos-Delis/Dotfiles --skill rebase-apostolos-delis
This Skill helps you integrate changes from the main branch into your current feature branch by rebasing, resolving any conflicts that arise, and pushing the updated branch safely.
--force-with-lease to prevent accidental overwrites of others' work.main has moved ahead. Use this Skill to bring your branch up-to-date with main without creating a merge commit, keeping your history linear.Use the rebase skill to rebase the current branch onto origin/main and resolve any conflicts.
High-intent search queries and answers about installing and using this skill.
To rebase your Git branch onto main safely, this Skill performs pre-flight checks to ensure you have a clean working tree and are not on the main branch before applying commits sequentially to maintain a linear history.
The safest way to force push after rebasing is using the `--force-with-lease` command, which this Skill automates to prevent accidental overwrites of remote commits while updating your branch.
During a Git rebase, this Skill detects merge conflicts and guides you through the resolution process step-by-step, ensuring your feature branch integrates cleanly with the updated base branch.
You should use Git rebase instead of merging when you want to integrate changes from the main branch into your feature branch without creating a merge commit, keeping your project history clean and linear.
No external dependencies are required. This Skill operates using built-in scripts and references to validate your repository status, manage branch context, and execute the rebase sequence.
Your Git rebase may be failing if pre-flight checks detect you are on the main branch or have a dirty working tree, which this Skill validates before execution to prevent repository corruption.
agentty-xyzInspect git status, diffs, and logs to write repository-compliant commit messages.
jcdendriteSynchronize a divergent Git feature branch with the remote default branch.
cryfsManage version control workflows with JJ, a Git-compatible system.
dtsongSquash multiple Git commits into one non-interactively.