Move conflict msg creation into a separate function

flake8 was complaining about an overly complex method:
scc/git.py:1467:1: C901 'GitRepository.merge_pull' is too complex (12)