Worktrees and recovery

Work on two branches at once, resolve a conflict, or give an earlier commit a new branch name.

Open two branches side by side

  1. From the current-branch menu, open Worktrees… and choose Create.
  2. Select an available local branch, or name a new branch and choose its starting branch, tag or commit. Pick an existing parent folder and enter a new folder name.
  3. Review the resolved commit, branch and absolute destination. Confirm, then open the new worktree in GitTurtle or your editor. The original checkout stays open with its own draft and working files.

In Manage, select a worktree to read its branch, commit and status. When you are done, review its folder and local changes before choosing removal. Ordinary removal protects dirty worktrees. Force removal can permanently delete files inside a linked worktree, including ignored files. A worktree can only be removed from a different, eligible checkout.

Set work aside

Open Actions in Working Changes to save a named stash or browse earlier ones. Inspect the staged, unstaged and untracked portions before restoring. Restoring keeps the stash entry available. Drop it separately once you have checked the result.

Resolve a merge or rebase conflict

  1. Open the conflicted file in Working Changes. Select Previous or Next to inspect an unresolved block. Read the labelled Current and Incoming sources. During rebase, Current is the updated base and Incoming is the commit being replayed.
  2. Choose Accept current, Accept incoming or Accept both for that block, or edit the result. Save draft writes the working result while leaving the file conflicted in the index.
  3. After resolving the blocks, choose Save and stage result. You can also edit externally, refresh and use Stage edited file. When all files are ready, review the staged paths before Continue.

Abort attempts to restore the pre-operation state and explains when it cannot do so safely. Keep files ends the operation while keeping the current files and index. For a planned rewrite, native interactive rebase covers linear sequences of up to 100 commits after a base. More complex histories require Git’s configured tools.

Recover a commit

Choose Local reflog & recovery… from the current-branch menu. The initial list is this worktree’s HEAD log. To examine a shared branch log, enter the local branch name. Select an entry, inspect its commit and changed paths, then choose Review recovery branch… and give the new branch an unused name. Confirming creates a reference to that commit and preserves your present checkout, index and working files.

Reflog entries expire, and an entry can outlive its commit object. Recovery needs the commit to be available locally.