What is a Git 3-way merge? When does it auto-resolve vs. conflict? · ORA·tech