Ensure that it doesn't break if a branch named `client-xx` already exist

[Heliosmaster]

We should have a fallback with another branch name such as client-XX-2 or something like that.