Create GitException to pass git error info
Actually ff as well as fetch in create_or_update_local_repo
Change conflict-pickme colour, allow HTML in conflict output
Requeue pickmes that are conflicted against, also when a pickme is de-pickmed
Fixup: Fetching repo updates
Send email when conflicts are detected