Release /
lazygit v0.56.0
Resolve every conflict in chosen files as ours, theirs or both from a merge menu, without an external tool.
Before you upgrade to v0.56.0
What changed in v0.56.0
`M` on a conflicted file now opens a merge options menu (ours, theirs, union, or the external merge tool); a no-ff merge option; several pagers in `git.pagers`, cycled with `|`.
Also: Checkout of the previous branch gives clearer feedback; `gui.skipSwitchWorktreeOnCheckoutWarning`.
v0.56.0.
New things you can do
Merge options menu on `M`, using git merge-file.
Fixed and improved
Configure several pagers in `git.pagers` and cycle them with `|`.
Seeded by 