21522b
Make repo.pull() raise a specific exception when there is a conflict When pulling from upstream leads to the situation where there is a conflict in the repo, repo.pull() will now raise a specific exception for this.