Repository navigation
BeeBranch 1.6.0
BeeBranch 1.6.0
See what an operation will do before it runs, resolve conflicts region by region, compare images side by side, draft the commit message in the graph, and open a terminal in the repository folder — on a more reliable undo and with Git errors that explain themselves.
Added
- Summary before an operation: pull, push, merge, rebase, cherry-pick, reset, stash pop and checkout now ask once, in the action bar, with the commits, files and lines involved. Conflict risk is predicted with
git merge-tree, the files that would conflict are listed by name, and an operation that would refuse explains why before anything runs. Cancelling changes nothing. - Per-region conflict resolution: a conflicted file that still has markers is split into regions that name their sides from the operation (the checked-out branch, the incoming commit, the stash) instead of ours and theirs. Each region can take either side, both, or the base, and any line of either side can be checked individually. Whole-file accept and free-form editing remain available; a region left undecided keeps its markers.
- Image diffs: an image (PNG, JPEG, GIF, WebP, AVIF, BMP) shows both revisions side by side with their dimensions and size instead of only “binary file”. Bytes are read at the diff revision through the same worktree-scoped, size-bounded path as text files; the renderer receives a
data:URL already allowed by the content policy. - Editable WIP node: the draft commit message is edited directly in the graph’s
// WIProw. Typing there or in the commit panel edits the same draft, so the message written in the graph is the one committed; the badge still opens the panel. - Built-in terminal: a terminal view opens a PTY in the repository folder with the shell from your environment, streams output, forwards keys and resizes, and closes the shell when the view closes. The renderer never chooses the program; the backend owns the PTY.
- Commit CI in the repository toolbar: an indicator shows the state of the pipelines attached to the checked-out commit for the linked forge (GitLab pipelines, GitHub Actions runs), with the finished/total count. Clicking it lists each pipeline, expands its jobs, opens the forge page and refreshes every 30 seconds. It stays hidden until a forge project is linked and connected.
- Multi-file selection in the changes panel: ⌘/Ctrl+click adds or removes a file, Maj+click selects every file between the last clicked row and the clicked one, and the bulk bar stages, unstages or discards them in one call. Right-clicking a row of the selection opens grouped actions for every selected file.
- Notifications: action results and errors appear at the bottom of the window instead of banners above the workspace. A success disappears after a few seconds; an error stays until closed and keeps its remediation.
- Keyboard shortcut reference: press
?outside a text field, or use the command palette, to list every shortcut, including customised ones. - Relative dates: commits from the last week show their age (“3 hours ago”, “yesterday”) in the history and the commit detail.
- Visible undo: every undoable action is confirmed by a notification with an Undo button, and an undo by “Undone: …” with a Redo button. When the next undo or redo cannot run, its buttons are disabled and their tooltip says why.
Changed
- An operation in progress (merge, rebase…) is announced once, by the banner above the workspace, with a single action to resolve or manage it.
- The workspaces, GitLab, GitHub, profiles and recovery pages no longer show the repository toolbar and references, which do not apply to them.
- The repository panel only lists the review requests of the repository’s forge (merge requests for GitLab, pull requests for GitHub), or of the connected forges when the repository is not linked.
- The command palette shows customised shortcuts instead of the default ones.
Fixed
- Git errors on a non-English system: Git reports its messages in English to BeeBranch, so failures are recognised whatever the system language. Only the message language changes: the encoding of paths, hooks and editors is kept.
- Error messages: error codes that had no English wording now say what to do next — branches, tags, worktrees, squash, fetch-all and Git start-up included.
- Undo never discards uncommitted work: undoing a merge, rebase, cherry-pick or revert is refused while tracked files have uncommitted changes, and never overwrites an untracked file. An undo blocked by an untracked file is refused before it runs, with the file names, and the entry stays undoable.
- Several commits can be undone in a row; the undone changes stay staged. Undo is no longer blocked by unrelated changes (a new untracked file, an edit elsewhere, a background fetch): undoing a branch, tag or remote operation only checks what it restores.
- Redo after several undos re-applies the most recent undo first. A change outside the undo history (stage, discard, pull…) clears the redo instead of leaving one that fails.
- Undoing the deletion of an annotated tag restores the original tag object (same message, tagger and signature), or rebuilds it on its commit if Git pruned it.
- Pressing undo twice quickly undoes two operations instead of failing. The commit panel’s Undo the commit only targets its own commit.
- Removing a worktree with local changes is no longer offered as undoable, since its changes cannot be restored; undoing the creation of a worktree also deletes the branch it created. Redoing a worktree removal never forces it.
- Undoing a branch drop that stashed local changes, or an operation stopped on conflicts, is refused once those files were edited again, instead of losing the edits. The automatic stash is dropped by its commit, so a stash pushed in between is never removed.
Notes
- The pre-operation summary reads local references; it does not fetch. Conflict prediction requires Git 2.38 or newer and is reported as unavailable below that; a multiple cherry-pick is predicted from its first commit.
- Per-region resolution applies while the working file still contains markers; once markers are removed, whole-file resolution remains.
- The built-in terminal uses the shell from the environment (
$SHELL,COMSPECon Windows), opens at most eight sessions, and is tested on macOS and Linux; the Windows path compiles and passes the suite but does not run a PTY test. - The update artifact is signed with the same key as 1.5.0: Settings → Updates offers 1.6.0, and “Return to the previous version” goes back to 1.5.0 through
rollback.json.