関連ワード:  git merge methods    github merge methods    git merge techniques    git merge procedure    git merge ways    git merge approaches    github allow merge methods    different git merge strategies    git merge theirs example