A Git operation needs attention
When a merge, rebase, cherry-pick, revert or bisect stops partway, GitTree shows a banner such as Rebasing … onto …, step 3 of 7 and marks the tab rebase in progress. Most commands wait until it is finished: resolve any conflicts, then Continue, Skip the step, or Abort… to go back to where you started.
Works in GitTree Free: every local Git feature, once you are signed in.
On this page
Before you start
- The repository is open and its tab says an operation is in progress.
Where to find it
- The Operation in progress banner; the palette: Continue Operation, Skip Current Step, Abort Operation….
| Action | macOS | Windows and Linux |
|---|---|---|
| The command palette | ⌘⇧P | Ctrl+Shift+P |
Steps
Read the banner
It says what is happening, on which branch, and how many conflicts are left.
Resolve conflicts
Press Resolve and fix each conflicted file (Resolve conflicts).
Finish or back out
Press Continue when every conflict is resolved, Skip to drop this step, or Abort… to return to the state before the operation.
Expected result
The operation is finished or undone, and every command works again.
If something goes wrong
Git says a lock file exists, such as index.lock
Another Git program is working in this repository. Close it and try again; the Activity Log shows the full message.
Questions
Can I undo an aborted rebase?
Abort returns to where you started. For other recoveries, see Undo and redo.