Urgent: git problem
ollie at ocharles.org.uk
Wed Oct 23 16:29:56 UTC 2019
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
<ghc-devs at haskell.org> wrote:
> Aieee! All my GHC repos are failing with this. As a result I can’t pull. What should I do? Thanks!
> 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 at MSRC-3645512:~/code/HEAD-2$
> ghc-devs mailing list
> ghc-devs at haskell.org
More information about the ghc-devs