conflict in backport break fast-forward optimisation.

[Carreau]

When backporting the bot attempt to reuse previous clone and just do a pull.
This can fail, and then erase the full-repository and re-clone.

One of the case where this can fail, is when the previous backport did not apply cleanly and the merge conflict has not been resolved.

When this is the case we should try to cleanup the merge conflict.