🛠️ Conflict resolution got a serious upgrade
GitLens now identifies conflict types, provides inline resolution actions, shows confidence indicators, and gives side-by-side conflict history.
Even previously unsupported conflict types are now handled much more intelligently.
Jul 21, 2026 · 10:10 PM UTC
1
1
34
GitLens 18.3 continues our mission of building the best Git workflow for the Code Flow era.
Update today and let us know your favorite new improvement👇
help.gitkraken.com/gitlens/g…
1
32

