Don't log all possible conflicts

Amongst other things it avoids s Flake8 error:
scc/git.py:1355:1: C901 'GitRepository.merge' is too complex (14)