David Kastrup <d...@gnu.org> writes: > David Nalesnik <david.nales...@gmail.com> 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://git.sv.gnu.org/srv/git/lilypond >> ! [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:
Like _Jonas_ 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
