Re: problem with git pull -r

On Thu, Nov 21, 2019 at 9:45 AM Jonas Hahnfeld wrote: > > Am Donnerstag, den 21.11.2019, 16:30 +0100 schrieb Werner LEMBERG: > > > Below is the console output. Any ideas? > > > > > > Clone the repository anew, and everything should be fine again. > > This works of course but is pretty

Re: problem with git pull -r

David Kastrup writes: > David Nalesnik 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'

Re: problem with git pull -r

David Nalesnik 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 >

Re: problem with git pull -r

On Nov 21, 2019, at 10:30, Werner LEMBERG wrote: > Clone the repository anew, and everything should be fine again. > > Don't forget to `transfer' your old local branches before deleting the > old repository clone! I only had two local ones, so it was rather > easy. But I guess some of you have

Re: problem with git pull -r

Am Donnerstag, den 21.11.2019, 16:30 +0100 schrieb Werner LEMBERG: > > Below is the console output. Any ideas? > > > Clone the repository anew, and everything should be fine again. This works of course but is pretty destructive. A simple $ git fetch --prune did the job for me. This removes

Re: problem with git pull -r

> Below is the console output. Any ideas? Clone the repository anew, and everything should be fine again. It seems that git has been upgraded on Savannah; a comparison between the old and the new clone shows a lot of differences in the `.git' directory... Maybe they forgot to set a

Re: problem with git pull -r

Oh. Me too. :( On Thu, 21 Nov 2019 15:07:30 +, David Nalesnik wrote: > 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': >

problem with git pull -r

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