Rebase the current branch onto the default branch with autostash.
npx skills add https://github.com/nobelk/claude-tools --skill git-rebase-main
Please help me install this Agent Skill. Skill: git-rebase-main Source: https://github.com/nobelk/claude-tools/tree/main/skills/git-rebase-main Command: npx skills add https://github.com/nobelk/claude-tools --skill git-rebase-main
Rebase the current branch onto the default branch to incorporate the latest changes from main or master, helping keep feature work up-to-date and reduce merge conflicts.
Run the bundled script from the repository directory to rebase your current branch onto the default branch.
High-intent search queries and answers about installing and using this skill.
To rebase your current feature branch onto the latest main, you need to fetch updates from origin and apply them using git rebase. This process incorporates the newest changes from the default branch into your current work.
Keeping a feature branch in sync with the default branch involves rebasing your current work onto main or master. This aligns your feature work with the latest changes and helps reduce merge conflicts in collaborative workflows.
Yes, git rebase can work with uncommitted changes by using the --autostash option. This automatically stashes your local modifications before applying the rebase and restores them afterward, preserving your work safely.
When rebasing a branch onto main and encountering conflicts, you should resolve them manually in your files. After resolving, you can continue or abort the rebase process using guided git commands to restore your branch state.
Yes, you can automatically detect whether the default branch is main or master before executing a rebase. The detection process checks the repository configuration to identify the correct default branch and rebases onto it.
gajjalaashok75-UIStages modified files, commits conventionally, and pushes to remote tracking repository.
AbildtoftRebase the current branch onto the latest base branch and force-push with --force-with-lease.
einja-incResolve git conflicts per file during rebase, merge, stash, or cherry-pick.
mvillmowSyncs Git worktrees by fetching remote and rebasing or merging main into feature branches.
