parser fails when getting git sources that have merge conflicts

[Joe Talbott]

This shouldn't bring the parser to a grinding halt.

[Joe Talbott (joetalbott)]

osepht@poplar:~/src/git/snapcraft$ snapcraft-parser -i index
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 3 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/josepht/index-test
 * branch HEAD -> FETCH_HEAD
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
Traceback (most recent call last):
  File "/usr/bin/snapcraft-parser", line 29, in <module>
    wiki_errors = snapcraft.internal.parser.main()
  File "/usr/lib/python3/dist-packages/snapcraft/internal/parser.py", line 87, in main
    return run(args)
  File "/usr/lib/python3/dist-packages/snapcraft/internal/parser.py", line 329, in run
    data = _process_index(output)
  File "/usr/lib/python3/dist-packages/snapcraft/internal/parser.py", line 292, in _process_index
    pending_validation_entries)
  File "/usr/lib/python3/dist-packages/snapcraft/internal/parser.py", line 264, in _try_process_entry
    pending_validation_entries)
  File "/usr/lib/python3/dist-packages/snapcraft/internal/parser.py", line 241, in _process_wiki_entry
    parts_list, after_parts = _process_entry(data)
  File "/usr/lib/python3/dist-packages/snapcraft/internal/parser.py", line 198, in _process_entry
    handler.pull()
  File "/usr/lib/python3/dist-packages/snapcraft/internal/sources.py", line 238, in pull
    self.source, refspec])
  File "/usr/lib/python3.5/subprocess.py", line 581, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', '-C', '/tmp/httpsgithub.comjosephtindex-test.git', 'pull', '--recurse-submodules=yes', 'https://github.com/josepht/index-test.git', 'HEAD']' returned non-zero exit status 1

[Joe Talbott (joetalbott)]

PR is here: https://github.com/snapcore/snapcraft/pull/1052