Skip to content

carapace-sh/carapace-bin / skills/but

Use when working with the GitButler CLI (`but`) — virtual branches, stacked branches, workspace model, commit editing (rub, amend, squash, reword), CLI IDs, forge integration, PRs, operations log, conflict resolution, TUI, AI agent setup, skills, aliases, configuration. Triggers on: "but", "gitbutler", "but rub", "but commit", "but status", "but branch", "but apply", "but unapply", "but push", "but pull", "but pr", "but oplog", "but undo", "but redo", "but resolve", "but stage", "but squash", "but amend", "but reword", "but config", "but alias", "but setup", "but teardown", "but tui", "but diff", "but show", "but agent", "but skill", "but clean", "but move", "but pick", "but absorb", "but update", "but completions", "virtual branch", "stacked branch", "integration branch", "gitbutler workspace", "but oplog restore", "but oplog snapshot", "CLI ID", "hunk ID".

FileKindSize
SKILL.mdskill md5.5 KB
references/ai-agents.mdmarkdown6.2 KB
references/branches.mdmarkdown5.4 KB
references/commits.mdmarkdown6.9 KB
references/config.mdmarkdown4.5 KB
references/conflicts.mdmarkdown2.1 KB
references/forge.mdmarkdown3.6 KB
references/inspection.mdmarkdown4.5 KB
references/misc.mdmarkdown3.4 KB
references/oplog.mdmarkdown3.3 KB
references/rubbing.mdmarkdown3.0 KB
references/tui.mdmarkdown2.1 KB
references/workspace.mdmarkdown4.6 KB

references/conflicts.md

View on GitHub
# Conflict Resolution

How GitButler handles conflicts during rebase, pull, and branch update operations.

> **Source of truth**: <https://docs.gitbutler.com/cli-guides/cli-tutorial/conflict-resolution>

## Key Difference from Git

Rebases **always succeed** in GitButler. Conflicts don't halt the operation — instead, conflicted commits are marked as conflicted (shown with the `◐` icon in status output). You resolve conflicts one commit at a time without stopping the rebase.

## Conflict Markers

GitButler uses **zdiff3** style conflict markers, which show ours/theirs/ancestor:

```
<<<<<<< ours
our version
||||||| ancestor
original version
=======
their version
>>>>>>> theirs
```

## `but resolve` — Conflict Resolution Mode

Parent command for conflict resolution operations.

### `but resolve`

Enter conflict resolution mode. This begins the interactive resolution process for conflicted commits.

### `but resolve finish`

Finalize the conflict resolution. Commits the resolved state and marks the conflict as resolved.

```bash
but resolve finish
```

### `but resolve cancel`

Cancel conflict resolution mode. Reverts to the pre-resolution state.

```bash
but resolve cancel
```

### `but resolve status`

Show the current conflict resolution status — which commits are conflicted and what remains to resolve.

```bash
but resolve status
```

## Workflow

```
but pull                           # Pull triggers a rebase with conflicts
but status                         # See which commits are conflicted (◐ icon)
but resolve                        # Enter resolution mode
  # edit files to resolve conflicts
but resolve finish                 # Finalize resolution
  # or
but resolve cancel                 # Cancel and revert
```

## Conflict Detection in Other Commands

`but branch show --check` can check if a branch merges cleanly into upstream and identify conflicting commits:

```bash
but branch show --check <branch>
```

## Related

- [oplog.md](oplog.md) — Undo conflict resolution with `but undo`
- [branches.md](branches.md) — `but branch update` can trigger conflicts
- [forge.md](forge.md) — `but pull` can trigger conflicts
reverse-engineer-anythingmorluto/reaReverse engineer native, managed, Electron/JavaScript, packaged, firmware, and browser targets with REA, and build agent environments (AgentEnv bundles) of web applications from a live instance or a capture, and of Linux desktop apps with a task from a request. Use shipped-artifact or requested runtime evidence to explain features, compare versions, decompile code, or guide a reconstruction. Skip REA for ordinary source-repository architecture analysis.Stars: 472kUpdated Claude CodeCodexVerifiedInstall
diagnosing-superpowersobra/superpowersUse when a superpowers session went wrong and your human partner wants to know why — repeated work, ignored plans, stumbles, poor results, a skill that didn't fire, "it took too long", "why is it so expensive", "what is it doing" — or wants to build a bug report for the superpowers maintainers, for the current session or a past one identified by id or path, on any harness.Stars: 322kUpdated Claude CodeCodexVerifiedInstall
dispatching-parallel-agentsobra/superpowersUse when facing 2+ independent tasks that can be worked on without shared state or sequential dependenciesStars: 322kUpdated Claude CodeCodexVerifiedInstall
executing-plansobra/superpowersUse when executing an implementation plan in the current session as the implementer yourself — your human partner chose inline execution, or no subagent tool is availableStars: 322kUpdated Claude CodeCodexVerifiedInstall