-
v1.8.10 Stable
nntrivi2001 released this
2026-09-25 06:37:46 +00:00 | 147 commits to main since this releaseResolve merge conflicts block by block, with each side clearly marked.
- A real conflict view. Opening a conflicted file in the Changes panel shows every conflict block as its two sides — Mine (green) and Theirs (blue), labelled with the branch names from git — instead of raw
<<<<<<<markers. Pick Keep mine, Take theirs or Keep both per block (undoable), jump between blocks with ^/v, then Save and mark resolved. Keep all mine / Take all theirs do the whole file; Edit by hand opens the plain editor. A file changed meanwhile is never overwritten. (#45) - Clearer conflict list. The Merge conflicts group uses labelled Keep mine / Take theirs buttons instead of arrow icons, and a conflicted file carries a red ! in the Files tree.
- Fix: a conflicted file no longer appears three times in the Files tree.
Downloads
- A real conflict view. Opening a conflicted file in the Changes panel shows every conflict block as its two sides — Mine (green) and Theirs (blue), labelled with the branch names from git — instead of raw