---
title: "Git Rebase with Intelligent Conflict Resolution - Air Market"
description: "You are rebasing a branch and conflicts are piling up, and you are worried about quietly dropping something you wrote. This handles the rebase and works through the conflicts while keeping your featu…"
canonical: "https://airmarket.ai/app/git-rebase"
---

[Air Market](/) / [Developer Tools](/category/devtools) / Git Rebase with Intelligent Conflict Resolution

Skill by [CompozyOS](/@compozy)

# Git Rebase with Intelligent Conflict Resolution

Get through a messy rebase without losing your work

## What this does

You are rebasing a branch and conflicts are piling up, and you are worried about quietly dropping something you wrote. This handles the rebase and works through the conflicts while keeping your features intact. Reach for it when a feature branch needs rebasing or conflicts span several commits. It is not for merge-commit workflows or cherry-picking.

### Top 3 things it does for you

- Rebase a feature branch
- Resolve conflicts spread across commits
- Keep history clean and linear

## Information

**Git Rebase with Intelligent Conflict Resolution at a glance**

|  |  |
| --- | --- |
| Kind | Skill |
| Publisher | [CompozyOS](/@compozy) |
| Category | [Developer Tools](/category/devtools) |
| Works with | Agent Skills - an open standard supported by 40+ agents |
| Size | 35 KB |
| Licence | MIT |
| Repository | [compozy/compozy](https://github.com/compozy/compozy/tree/9296ed7e91615b74332931781dd94599ac8db2d5/extensions/spec-cycle/skills/git-rebase) |
| GitHub stars | 2,660 (as of Nov 2026) |
| Installs | 22, counted by skills.sh (Nov 2026) |

## Security report

**Verified.** AIR scanned this exact version of Git Rebase with Intelligent Conflict Resolution and flagged nothing. AIR's verdict: **safe**.

**What Git Rebase with Intelligent Conflict Resolution's check was run against**

|  |  |
| --- | --- |
| Commit | 9296ed7e91615b74332931781dd94599ac8db2d5 |
| Content hash | 268b99c51ffd1f7769498fcf13b094792f3a64755c0a9fa2c5056223c1a243f2 |
| Files read | [Browse the files at this exact commit](https://github.com/compozy/compozy/blob/9296ed7e91615b74332931781dd94599ac8db2d5/extensions/spec-cycle/skills/git-rebase/SKILL.md) |

A scan is named by the exact content it read, not by a version number. A different version is a different artifact, and nothing here applies to a version AIR has not scanned.

[Read the full security report for Git Rebase with Intelligent Conflict Resolution](/security/git-rebase)

## About Git Rebase with Intelligent Conflict Resolution

This handles git rebase operations and resolves merge conflicts, with the aim of preserving features and maintaining code quality along the way.

Use it when rebasing feature branches, resolving conflicts that span several commits, and getting to a clean linear history without losing changes.

It is not the right fit for merge-commit workflows, for cherry-picking individual commits, or for setting up a repository in the first place.

## What's inside

- SKILL.md - instructions
- references/automation.md - reference
- references/resolution-patterns.md - reference
- references/scripts-tools.md - reference
- references/strategies.md - reference
- references/troubleshooting.md - reference
- scripts/analyze-conflicts.sh - script
- scripts/pre-rebase-backup.sh - script
- scripts/validate-merge.sh - script

## Questions

### Is Git Rebase with Intelligent Conflict Resolution safe to install?

AIR scanned this exact version of Git Rebase with Intelligent Conflict Resolution and flagged nothing. AIR's verdict: safe. The verdict is named by the content that was read, at commit 9296ed7e9161, so it cannot drift onto a version nobody scanned. The full report is at https://airmarket.ai/security/git-rebase.

### How do I install Git Rebase with Intelligent Conflict Resolution?

Open https://airmarket.ai/app/git-rebase on Air Market and use the install action: Air Market hands Claude a prompt naming this exact skill, and Claude sets it up. Source, pinned to the exact commit this listing describes: https://github.com/compozy/compozy/tree/9296ed7e91615b74332931781dd94599ac8db2d5/extensions/spec-cycle/skills/git-rebase. Install from that link, not the branch.

## Related on Air Market

- [More Developer Tools listings](/category/devtools)
- [Everything by CompozyOS](/@compozy)

---

Canonical URL: <https://airmarket.ai/app/git-rebase>