How to resolve merge conflicts in git By Emily 31 January 2022 Recently I’ve been working on a project that uses Azure DevOps as the remote repo, ... Read more