---
title: "Merge, rebase, cherry-pick and revert"
description: "gitā shows what a merge, rebase, cherry-pick, revert or reset will do before it starts, lets you continue, skip or abort, and has an editor for conflicts."
url: https://getgita.app/features/merge-and-rebase
lang: en
---

# Merge and rebase, shown before they run

The operations that join or rewrite history are the ones worth a second look. In gitā each one opens a sheet that says what is about to happen.

A live copy of the app is on the page: https://getgita.app/features/merge-and-rebase

## Things to try

1. Choose a branch in the Merge sheet.
2. Switch between the three ways to merge.
3. Right-click a commit in the history for **Cherry-pick** and **Revert**.

## Merge and rebase

- **A sheet first.** Merge, rebase, cherry-pick, revert and reset each start with a sheet that names the branch or commit involved. Nothing changes until you confirm.
- **Three ways to merge.** Fast-forward when possible, always create a merge commit, or fast-forward only. Choose your usual one in Settings ▸ Git, where a small animation shows what each does.
- **Edit commits.** Edit Commits After This is an interactive rebase. Set each commit to pick, reword, edit, squash, fixup or drop, drag them into a new order, and gitā checks the plan before it runs.
- **Continue, skip, abort.** While an operation is under way, a bar over the history says how far it has got and how many files are unresolved, with Continue, Skip and Abort.
- **Conflict editor.** A conflicted file opens with the base, the current and the incoming version, and an editable result underneath. Take one side with a button or write the result yourself, then Save & Stage.
- **Reset, with the count.** Reset to a commit keeping staged changes, keeping your files, or discarding tracked changes. The sheet tells you how many files that affects, and a hard reset needs a tick first.
- **It checks again.** Before anything runs, gitā makes sure the repository is still on the branch and commit you looked at.

## Questions, answered

### Can I resolve merge conflicts in gitā?

Yes. A conflicted file opens with the base, the current and the incoming version, and an editable result underneath. Take one side with a button or write the result yourself, then **Save & Stage**.

### Does gitā support interactive rebase?

Yes. **Edit Commits After This** is an interactive rebase: set each commit to pick, reword, edit, squash, fixup or drop, drag them into a new order, and gitā checks the plan before it runs.

[All features](https://getgita.app/features.md)

- **Download for macOS:** https://github.com/rolottr/gita/releases/latest
- **View on GitHub:** https://github.com/rolottr/gita

---

Apple, macOS and Mac are trademarks of Apple Inc. Git is a trademark of Software Freedom Conservancy. GitHub is a trademark of GitHub, Inc. Vercel is a trademark of Vercel Inc. Claude is a trademark of Anthropic, PBC. gitā is independent software and is not affiliated with any of them. Issues: https://github.com/rolottr/gita/issues
