How to reduce conflicts in git

This is part of the Semicolon&Sons Code Diary - consisting of lessons learned on the job. You're in the git category.

Last Updated: 2021-05-15

How to reduce merge conflicts?