Handle running fetch_config more than once

The logic before assumed we'd be in a fresh repo - but we are no longer.
So change the logic to use -B which will remake and reset the branch,
which is actually what we want.

Change-Id: Ic216999b68bec5fb22acef3c5c1f09e49532e5c4