The Wayback Machine - https://web.archive.org/web/20220121114106/https://devops.com/devooops-moves-scm-conflicts/