What's Changed
New features:
- Overhauled Merge Conflicts handling: It no longer sucks! Whenever there are conflicts, they will be indicated on the affected commits, and you can resolve them one at a time, whenever appropriate. Conflicted branches are no longer kicked out of Workspace.
- Edit Mode: Adds the ability to edit the changes of a specific commit - this is useful when trying to precisely craft your git history, and it is also what enables the new merge conflict resolving.
- Workspace update preview: When updating the workspace, a preview is presented with information on how your branches are affected (e.g. if there are conflicts, if the branch is already integrated). It also allows to specify the desired operation per lane (rebase/merge/stash)
Minor changes
- Pull Request creation now includes a step allowing for adding a PR description
- It is now possible to generate a branch summary for the PR description
- Adds support for handling the case when the base branch has diverged from the remote
- Minor updates to icons, colors & layout in the app
Full Changelog: release/0.12.27...release/0.13.0
Downloads
Download bins from https://gitbutler.com/