Understanding Merge Conflicts — Roadmap Step & Resources

Why conflicts happen and how Git marks them in a file

Open on Cached Info