Handle cases where pruning is required.

[chrisgavin]

In some rare circumstances it might be that we can't pull or push new branches without first pruning existing ones, e.g. if the branch x used to exist, but was deleted and a new branch x/y was created.

Ideally we should handle this by pruning branches at the appropriate times.