Can't update gui branch: git error

[Michael Goffioul]

Just tried to update my gui branch and got this git error:

getting .hgsubstate

pulling subrepo gui/qterminal from https://code.google.com/p/qterminal/

remote: Counting objects: 11, done.

remote: Finding sources: 100% (11/11), done.

remote: Total 11 (delta 3)

Unpacking objects: 100% (11/11), done.

From https://code.google.com/p/qterminal

   6ae5b4e..9d13275  master     -> origin/master

fatal: A branch named 'origin/master' already exists.

abort: git checkout error 128 in gui/qterminal

I guess I could wipe out my local repo of qterminal, but anyone has an idea what's going on?

Michael.