Thanks. Yes 'git remote prune origin' did the trick! Simon
| -----Original Message----- | From: Oliver Charles <[email protected]> | Sent: 23 October 2019 17:30 | To: Simon Peyton Jones <[email protected]> | Cc: ghc-devs <[email protected]> | Subject: Re: Urgent: git problem | | I usually encounter this when there has once been a branch called | "wip/rae" (so .git would have a *file* wip/rae), but now there's a | branch called "wip/rae/remove-tc-dep", so "wip/rae" should be a | directory, but it's already in .git as a file! I think "git remote | prune" fixes this, but I can't entirely recall. | | On Wed, Oct 23, 2019 at 5:22 PM Simon Peyton Jones via ghc-devs | <[email protected]> wrote: | > | > Aieee! All my GHC repos are failing with this. As a result I can’t | pull. What should I do? Thanks! | > | > Simon | > | > | > | > git pull | > | > error: cannot lock ref 'refs/remotes/origin/wip/rae/remove-tc-dep': | 'refs/remotes/origin/wip/rae' exists; cannot create | 'refs/remotes/origin/wip/rae/remove-tc-dep' | > | > From gitlab.haskell.org:ghc/ghc | > | > ! [new branch] wip/rae/remove-tc-dep -> | origin/wip/rae/remove-tc-dep (unable to update local ref) | > | > error: cannot lock ref 'refs/remotes/origin/wip/rae/split-up-modules': | 'refs/remotes/origin/wip/rae' exists; cannot create | 'refs/remotes/origin/wip/rae/split-up-modules' | > | > ! [new branch] wip/rae/split-up-modules -> | origin/wip/rae/split-up-modules (unable to update local ref) | > | > simonpj@MSRC-3645512:~/code/HEAD-2$ | > | > _______________________________________________ | > ghc-devs mailing list | > [email protected] | > | https://nam06.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.hask | ell.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc- | devs&data=02%7C01%7Csimonpj%40microsoft.com%7Ca21353034c8540fe2e1208d7 | 57d644a6%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637074450093374131&a | mp;sdata=jMgjQRgGI93G4HbZPhfnmEEOyRcgK%2BBOhdcQYmH2m1M%3D&reserved=0 _______________________________________________ ghc-devs mailing list [email protected] http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
