---
title: "rebase"
description: "Rebase the current feature branch onto the latest upstream branch and resolve conflicts."
type: skill
canonical_url: https://claudary.paisolsolutions.com/skills/rebase
source: "Claudary"
difficulty: intermediate
author: "Claude Code Knowledge Pack"
date: 2026-07-10T11:37:32.770Z
license: CC-BY-4.0
attribution: "rebase — Claudary (https://claudary.paisolsolutions.com/skills/rebase)"
---

# rebase
Rebase the current feature branch onto the latest upstream branch and resolve conflicts.

## Overview

Rebase the current feature branch onto the latest upstream branch and resolve conflicts.

## Steps


1. Verify the current branch and its upstream:
2. Fetch the latest changes from remote:
3. Check for potential conflicts before rebasing:
4. Start the rebase:
5. If conflicts occur:
6. After successful rebase:
7. Report the rebase result.

## Format


```
Branch: <branch name>
Base: <upstream branch>
Commits Rebased: <count>
Conflicts: <count resolved>
```


## Rules

- Always use `--force-with-lease` instead of `--force` for safety.
- Never rebase shared branches that others are working on.
- Run the full test suite after rebasing.

---

Source: [Claudary](https://claudary.paisolsolutions.com/skills/rebase) · https://claudary.paisolsolutions.com