3 ms·
It shows you conflicting files. I normally resolve each via ediff or my IDE and then go back to magit. It’s not a diff/merge tool.
by johanvts 1y ago
It shows you conflicting files. I normally resolve each via ediff or my IDE and then go back to magit. It’s not a diff/merge tool.
- ashton314 1y agoEdiff and smerge are both fun to use in Emacs.