-
Pierre-Yves Chibon authored
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.
21522bb7
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.