There are 2 repositories under merge-conflict topic.
Learn why conflicts happen and how to resolve them.
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
Git tutorial with command line
A basic changelog manager made to avoid conflicts at git merge
Script to help launch KDiff3 with all parent versions for conflicted files
Github exercise of web programming course
A port of IntelliJ's diff merging algorithm to Haxe
Demonstração da resolução de conflitos git com Vim/Neovim
An Empirical Study of Parallel Refactorings in Merge Conflicts