search

mendix / m2ee-tools

m2ee, the Mendix runtime helper tools for GNU/Linux
Other
27 stars 40 forks source link

! [new branch] debian/master -> origin/debian/master (unable to update local ref) #47

Closed knorrie closed 4 years ago

knorrie commented 5 years ago

PSA: I'm converting the debian branches of this repo to DEP14 format when doing the v7.2.2 bugfix release.

That means that we'll have debian/master and debian/stretch etc.

For whoever has cloned this repo before, this will result in the error shown in the subject, when trying to fetch updates:

error: cannot lock ref 'refs/remotes/origin/debian/master': 'refs/remotes/origin/debian' exists; cannot create 'refs/remotes/origin/debian/master'
 ! [new branch]      debian/master            -> origin/debian/master  (unable to update local ref)
error: cannot lock ref 'refs/remotes/origin/debian/stretch': 'refs/remotes/origin/debian' exists; cannot create 'refs/remotes/origin/debian/stretch'
 ! [new branch]      debian/stretch -> origin/debian/stretch  (unable to update local ref)

The git client will suggest:

error: some local refs could not be updated; try running
 'git remote prune origin' to remove any old, conflicting branches

As long as you don't have a local branch based on the old upstream debian, just follow the instruction once, and you'll be fine.