On Mon, Feb 22, 2021 at 09:28:53AM -0500, Steve Dickson wrote: > > > On 2/22/21 2:39 AM, Pierre-Yves Chibon wrote: > > On Sun, Feb 21, 2021 at 05:21:33PM -0500, Steve Dickson wrote: > >> > >> Thanks you for your rapid reply! > >> > >> On 2/21/21 4:57 PM, Michael Young wrote: > >>> On Sun, 21 Feb 2021, Steve Dickson wrote: > >>> > >>>> I apologies if I missed something... If there is a > >>>> thread that talks about this please point me at it > >>>> but... > >>>> > >>>> when I do a git push on the master branch I get: > >>> ... > >>> > >>> You missed the branch renaming - master has been replaced by rawhide with alias main. > >> I figured it was something like that... but when I do a git branch -r I don't > >> see the rawhide branch... So how do I move from master to rawhide? > >> > >> From your explanation I figured all I had to is a > >> git checkout -b main origin/main > >> > >> which worked but when I do a git pull I get > >> > >> $ git pull > >> error: cannot lock ref 'refs/remotes/origin/rawhide': 'refs/remotes/origin/rawhide/user/steved/pnfs-rawhide' exists; cannot create 'refs/remotes/origin/rawhide' > >> From ssh://pkgs.fedoraproject.org/rpms/nfs-utils > >> ! [new branch] rawhide -> origin/rawhide (unable to update local ref) > >> > >> It appears that a very old refs "origin/rawhide/user/steved/pnfs-rawhide" > >> is messing things up... so how do I get ride of that old refs? > > > > I have renamed it on the server side, so if you try again this should work now > > :) > Thank you... but I still unable to create the rawhide branch: > > git pull > error: cannot lock ref 'refs/remotes/origin/rawhide': 'refs/remotes/origin/rawhide/user/steved/pnfs-rawhide' exists; cannot create 'refs/remotes/origin/rawhide' > From ssh://pkgs.fedoraproject.org/rpms/nfs-utils > ! [new branch] rawhide -> origin/rawhide (unable to update local ref) > * [new branch] rawhide_old/user/steved/pnfs-rawhide -> origin/rawhide_old/user/steved/pnfs-rawhide > > Doing the pull again I get: > > git pull > error: cannot lock ref 'refs/remotes/origin/rawhide': 'refs/remotes/origin/rawhide/user/steved/pnfs-rawhide' exists; cannot create 'refs/remotes/origin/rawhide' > From ssh://pkgs.fedoraproject.org/rpms/nfs-utils > ! [new branch] rawhide -> origin/rawhide (unable to update local ref) Do you have the old rawhide/user/sted/pnfs-rawhide branch in your local clone? If so, try git fetch -p or just delete the branch (since it was renamed, you could checkout rawhide_old/user/steved/pnfs-rawhide at any point). It seems the issue is with your local clone. Pierre _______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
