What changed in the Git Brain 0.0.26 merge editor?

The editor now aligns Local, Result, and Remote hunks against their shared base. It distinguishes independent changes from true conflicts, keeps exact source ranges and final newlines, preserves manual Result edits, and renders very large files reliably.

Can I still edit the Result pane by hand?

Yes. You can combine Local and Remote actions with direct edits in Result. Git Brain preserves those manual edits when you resolve nearby changes and keeps undo and redo available.

https://www.git-brain.com/blog/git-brain-0-0-26-three-way-merge-editor

Git Brain 0.0.26: A More Accurate Three-Way Merge Editor

Name: Git Brain
Availability: InStock
Author: Git Brain

Git Brain 0.0.26 rebuilds its Local, Result, and Remote merge view around the shared base so complex conflicts stay aligned, manual edits remain intact, and every hunk communicates its state clearly.