Fetch from Gerrit: checkout branch after resolving checkout conflicts