Git
Merges and rebases
What Pip shows while a merge, rebase, cherry-pick, revert or bisect is left unfinished — and why finishing it is always up to git.
What counts as unfinished#
While a multi-step operation is stopped part-way, git leaves marker files in .git, and Pip reads them on every scan. Five operations count: a merge, a rebase, a cherry-pick, a revert and a bisect — usually waiting on a conflict, sometimes on an edit step or, for a bisect, your next verdict. A git am session uses the rebase machinery, so it reads as a rebase with no branch name. A cherry-pick or revert of several commits also says how many are left.
The markers belong to each worktree, so a linked worktree can be mid-rebase while the main checkout is clean, and only the servers running from that worktree show it. When markers overlap — a leftover from an operation long gone, say — Pip names one, in the order git status checks them. A bisect open alongside another operation gives way to it, since a row has room for one word.
Where you will see it#
- Server row
- The operation takes the place of the branch and the ↑↓ or other word after it — Merge, Rebase (Rebase 3/7 once the step is known), Cherry-pick, Revert or Bisecting — and the row is tinted. A container's row names Docker rather than a repository, so it leaves the word to the Stats and Git tabs.
- Tray menu
- The server's submenu opens with a line such as main · rebase in progress.
- Stats tab
- A Git fact after the branch, such as Rebase 3/7 · 2 conflicted files.
- Git tab
- A banner above the cards, and the Conflicted files card under it. During a rebase the HEAD card names the branch being rebased, marked Detached while rebasing.
- Agents
- An agent working in the tree shows the same word on its row, tinted, and in its detail a badge and a line such as Rebase in progress · step 3 of 7 · rebasing feat/webhooks · 2 conflicted files.
Conflicted files#
During a merge, rebase, cherry-pick or revert, the Conflicted files card lists every path the index still holds in conflict — up to 200, then +N more. A file leaves the list when you stage it with git add, not when you save it: that is when git stops calling it unmerged. The list is read when the tab opens and again whenever the count or the step changes, never on a timer. With nothing left it says “No unmerged files”.
Pip lists the paths, as selectable text, and touches none of them. The Working copy card counts the same files under Conflicted. For a server in WSL or a container the card says “Pip lists conflicted files only for servers on this computer, not in WSL or a container.”
Finishing it is up to git#
Nothing here continues or aborts
There is no continue or abort button anywhere in Pip. Every banner ends “Pip only reports this. Continue or abort it in git.” Do that in your terminal or editor — git rebase --continue, git merge --abort and their siblings, or git bisect reset to close a bisect. The row, the tray and the tab clear on the next scan.
An operation can also be forgotten: a rebase stopped before lunch, and a server still serving the half-applied tree after it. If one sits with no progress for ten minutes while a server on this computer runs from that tree, Pip sends a notification — once per stall, and never for a bisect. It is on by default; Git notifications covers the switch, muting a repository, and what the notification says.
During a bisect#
A bisect is different: git checks out real commits for you to test, and it can stay open for a long time on purpose. The row says Bisecting and the banner Bisect in progress. While HEAD sits on a commit under test, the second line names the branch the bisect started from: “HEAD is a bisect checkout, not main itself.” Back on a branch with the bisect still open, it reads “A bisect started from main is still open.” — the reminder to run git bisect reset. A bisect begun from a detached HEAD gets the same sentences without a branch name.
There is no Conflicted files card, because a bisect checkout holds no conflicts, and no notification, however long it runs. Searching the servers list for the starting branch still finds the server, although HEAD is not on it.
When conflicts are not counted#
Counting conflicts means reading the index, and the scan does that only while the index file is 16 MiB or smaller — only a very large repository has one bigger — and in one piece: a split index (core.splitIndex) is never counted, and neither is one Pip cannot read at all. Otherwise the Stats tab says … · conflicts not counted and the banner “Conflicts not counted.” The number is unknown, not zero.
The Conflicted files card still tries when the tab opens, reading an index of up to 64 MiB. When it manages, Read when the tab opened appears beside its title: with no count from the scan to watch, the list does not follow you as you stage files, so switch away from the Git tab and back to read it again. Past 64 MiB, or when the index is split, it says “Pip could not read the index, so it cannot list these files.”
Did this page not answer it? Tell us what you were looking for — that is how Pip's documentation gets written.