Better git conflicts: zdiff3
Let's talk about git conflicts.  OK, we hate them 😅, but let move on.  You may have faced to the...
Tags: git, howto