[Numpy-discussion] git status
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. Is anyone else experiencing problems? -- _ Dr. Andrew Nelson _ ___ 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
[Numpy-discussion] Re: git status
On Sun, Aug 4, 2024 at 4:25 PM Andrew Nelson 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. > > Is anyone else experiencing problems? > I haven't noticed any problems here, but that doesn't mean there aren't any. How do you update your fork? Chuck ___ 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
[Numpy-discussion] Re: git status
On Mon, 5 Aug 2024 at 10:34, Charles R Harris wrote: > > On Sun, Aug 4, 2024 at 4:25 PM Andrew Nelson 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
[Numpy-discussion] Re: git status
What does your `.git/config` file show as the source for fetching numpy? I just do `git pull upstream main`. I think you can also pull with `--force`, which will overwrite your main branch. I wouldn't do that if you have dependent branches, I also think GitHub added a button to update your forked repository. On Sun, Aug 4, 2024 at 9:33 PM Andrew Nelson wrote: > On Mon, 5 Aug 2024 at 10:34, Charles R Harris > wrote: > >> >> On Sun, Aug 4, 2024 at 4:25 PM Andrew Nelson 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: charlesr.har...@gmail.com > ___ 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
[Numpy-discussion] Re: git status
For reference, the relevant part of my config file looks like: [remote "origin"] url = g...@github.com:charris/numpy.git fetch = +refs/heads/*:refs/remotes/origin/* [remote "upstream"] url = g...@github.com:numpy/numpy fetch = +refs/heads/*:refs/remotes/upstream/* I am using ssh, which is the `git@` bit, you probably want the `https://` version. Chuck On Sun, Aug 4, 2024 at 9:38 PM Charles R Harris wrote: > What does your `.git/config` file show as the source for fetching numpy? I > just do `git pull upstream main`. I think you can also pull with `--force`, > which will overwrite your main branch. I wouldn't do that if you have > dependent branches, I also think GitHub added a button to update your > forked repository. > > On Sun, Aug 4, 2024 at 9:33 PM Andrew Nelson wrote: > >> On Mon, 5 Aug 2024 at 10:34, Charles R Harris >> wrote: >> >>> >>> On Sun, Aug 4, 2024 at 4:25 PM Andrew Nelson 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: charlesr.har...@gmail.com >> > ___ 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
[Numpy-discussion] Re: git status
My git config is: [remote "origin"] url = https://github.com/andyfaff/numpy.git fetch = +refs/heads/*:refs/remotes/origin/* [remote "numpy"] url = https://github.com/numpy/numpy.git fetch = +refs/heads/*:refs/remotes/numpy/* [branch "main"] remote = numpy merge = refs/heads/main The main issue seemed to be with my fork on github. The button for updating/syncing wasn't usable as there was a conflict. It wasn't apparent what the conflict was. This conflict was also preventing me from pushing to origin/main. ___ 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
