<div dir="auto"><div>Ah, good to know there's a command *just* for pruning! I'd only ever seen the --prune flag to fetch/pull.<br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, 23 Oct 2019, 18.30 Oliver Charles, <<a href="mailto:ollie@ocharles.org.uk">ollie@ocharles.org.uk</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I usually encounter this when there has once been a branch called<br>
"wip/rae" (so .git would have a *file* wip/rae), but now there's a<br>
branch called "wip/rae/remove-tc-dep", so "wip/rae" should be a<br>
directory, but it's already in .git as a file! I think "git remote<br>
prune" fixes this, but I can't entirely recall.<br>
<br>
On Wed, Oct 23, 2019 at 5:22 PM Simon Peyton Jones via ghc-devs<br>
<<a href="mailto:ghc-devs@haskell.org" target="_blank" rel="noreferrer">ghc-devs@haskell.org</a>> wrote:<br>
><br>
> Aieee!   All my GHC repos are failing with this.  As a result I can’t pull.  What should I do?   Thanks!<br>
><br>
> Simon<br>
><br>
><br>
><br>
> git pull<br>
><br>
> 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'<br>
><br>
> From gitlab.haskell.org:ghc/ghc<br>
><br>
> ! [new branch]            wip/rae/remove-tc-dep    -> origin/wip/rae/remove-tc-dep  (unable to update local ref)<br>
><br>
> 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'<br>
><br>
> ! [new branch]            wip/rae/split-up-modules -> origin/wip/rae/split-up-modules  (unable to update local ref)<br>
><br>
> simonpj@MSRC-3645512:~/code/HEAD-2$<br>
><br>
> _______________________________________________<br>
> ghc-devs mailing list<br>
> <a href="mailto:ghc-devs@haskell.org" target="_blank" rel="noreferrer">ghc-devs@haskell.org</a><br>
> <a href="http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs" rel="noreferrer noreferrer" target="_blank">http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs</a><br>
_______________________________________________<br>
ghc-devs mailing list<br>
<a href="mailto:ghc-devs@haskell.org" target="_blank" rel="noreferrer">ghc-devs@haskell.org</a><br>
<a href="http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs" rel="noreferrer noreferrer" target="_blank">http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs</a><br>
</blockquote></div></div></div>