How to: Create a git Merge Conflict

Creating a git merge conflict is easier than you think. It usually naturally occurs when git doesn’t know which change to accept into a branch, while merging. Typically you want to avoid them, but for educational purposes or just to get a better understanding of them, let’s create a git merge conflict.

Continue reading “How to: Create a git Merge Conflict”