What is a Git merge conflict, its causes, and the standard resolution workflow? · ORA·tech