[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: problem with git pull -r

From: David Kastrup
Subject: Re: problem with git pull -r
Date: Thu, 21 Nov 2019 17:19:50 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux)

David Nalesnik <address@hidden> writes:

> Below is the console output.  Any ideas?
> Thanks,
> David
> [dev@lilydev:lilypond-git]$ git pull -r
> error: cannot lock ref
> 'refs/remotes/origin/dev/jmandereau/merge-make-and-stepmake':
> 'refs/remotes/origin/dev/jmandereau' exists; cannot create
> 'refs/remotes/origin/dev/jmandereau/merge-make-and-stepmake'
> From ssh://
>  ! [new branch]            dev/jmandereau/merge-make-and-stepmake ->
> origin/dev/jmandereau/merge-make-and-stepmake  (unable to update local
> ref)
> error: cannot lock ref
> 'refs/remotes/origin/dev/jmandereau/stable-2.20-201902':
> 'refs/remotes/origin/dev/jmandereau' exists; cannot create
> 'refs/remotes/origin/dev/jmandereau/stable-2.20-201902'
>  ! [new branch]            dev/jmandereau/stable-2.20-201902 ->
> origin/dev/jmandereau/stable-2.20-201902  (unable to update local ref)

Like Johann said:

git pull -r -p

should do the trick.  The problem is that John had reused a branch of
his as a directory of branches and that's a replacement Git will not do
on its own.  -p (or --prune) removes non-existent branches before
pulling, so that conflict stops existing.

David Kastrup

reply via email to

[Prev in Thread] Current Thread [Next in Thread]