Repository navigation
Liana 0.6.0 — a rebuilt three-pane conflict resolver and a smoother diff viewer.
Downloads
Liana-0.6.0.AppImage— portable Linux app (x86_64).chmod +xand run.liana_0.6.0_amd64.deb— Debian/Ubuntu package.Liana.0.6.0.exe— portable Windows app (x64 and arm64 in one binary), no installer.Liana-0.6.0-universal-mac.zip— unsigned universal macOS app (x64 + arm64); Gatekeeper will warn on first launch.
Highlights
- Conflict resolution is now three synchronized panes. The full Ours and Theirs files sit above an editable Result, all scrolling together vertically. Conflict lines are highlighted and clickable, and picking them rewrites only that block in the Result.
- The resolver opens on the first conflict and the Prev / Next controls keep the Result and both side panes in step.
- Diffs jump to the first change when opened, and the duplicate diff overview scrollbar is gone.
- Switching branches stashes automatically when needed instead of failing on uncommitted changes.
- Rejected review comments survive across batches, so a later batch keeps the comments you chose not to post.
Built from the git CLI only — no libgit2/nodegit/isomorphic-git.
Full Changelog: v0.5.3...v0.6.0