Articles with "git"

Use zdiff3 for easier merge conflict resolution

If you've worked with Git for some time, you've likely encountered some conflicts that are tricky to resolve. You may not have known that there are three different conflict styles to choose...