Increase debugging and re-clone if there is a conflict when pulling
    
    If when we pull from a remote git repo we end up in a situation where
    there is a conflict (for example the user forced-push a new commit), then
    we should just drop our current clone and re-clone the repo.