GitHub repository: mishmanners/resolve-merge-conflicts-jul22stream
Created: 2022-07-14T07:02:02Z
Description: Why conflicts happen, and how to resolve them. Live streamed 14 July 2022.