On Mon, 5 Aug 2024 at 10:34, Charles R Harris <charlesr.har...@gmail.com> wrote:
> > On Sun, Aug 4, 2024 at 4:25 PM Andrew Nelson <andyf...@gmail.com> wrote: > >> Hi all, >> for some reason my fork has got way out of date and is missing commits >> from back to April. I'm not sure if my fork got messed up, or whether the >> numpy repo history has been affected. >> >> I haven't noticed any problems here, but that doesn't mean there aren't > any. How do you update your fork? > > Chuck > On my local fork I: > git fetch numpy > git checkout main > git rebase numpy/main > git push origin main When I did that the push step hung. I couldn't resync my fork on github either (there's a button for that), there was a conflict. In the end I had to delete the main branch on my GH fork, after setting something else to be the default branch, and then repush my local main to my GH fork.
_______________________________________________ NumPy-Discussion mailing list -- numpy-discussion@python.org To unsubscribe send an email to numpy-discussion-le...@python.org https://mail.python.org/mailman3/lists/numpy-discussion.python.org/ Member address: arch...@mail-archive.com
