Mastering Git: Guide To Resolving Merge Conflicts

Responsive image
source