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 _____________________________________
On Mon, 5 Aug 2024 at 10:34, Charles R Harris <charlesr.harris@gmail.com> wrote:
On my local fork I:
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.
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 <andyfaff@gmail.com> wrote:
For reference, the relevant part of my config file looks like: [remote "origin"] url = git@github.com:charris/numpy.git fetch = +refs/heads/*:refs/remotes/origin/* [remote "upstream"] url = git@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 <charlesr.harris@gmail.com> wrote:
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.
Why are you rebasing after fetching? You provably don’t want to rebase what’s supposed to be a public branch on top of a public commit like that. To make sure your fork and upstream numpy have the same main branch, do: git fetch numpy main git checkout numpy/main git branch -f main git checkout main git push -f origin main Now your old “main” branch is lost. I’m assuming you don’t care about it. Leave behind a branch by doing “git checkout -b main-backup” before doing “branch -f” if you do care about it. On Sun, Aug 4, 2024 at 10:16 PM Andrew Nelson <andyfaff@gmail.com> wrote:
On Mon, 5 Aug 2024 at 10:34, Charles R Harris <charlesr.harris@gmail.com> wrote:
On my local fork I:
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.
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 <andyfaff@gmail.com> wrote:
For reference, the relevant part of my config file looks like: [remote "origin"] url = git@github.com:charris/numpy.git fetch = +refs/heads/*:refs/remotes/origin/* [remote "upstream"] url = git@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 <charlesr.harris@gmail.com> wrote:
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.
Why are you rebasing after fetching? You provably don’t want to rebase what’s supposed to be a public branch on top of a public commit like that. To make sure your fork and upstream numpy have the same main branch, do: git fetch numpy main git checkout numpy/main git branch -f main git checkout main git push -f origin main Now your old “main” branch is lost. I’m assuming you don’t care about it. Leave behind a branch by doing “git checkout -b main-backup” before doing “branch -f” if you do care about it. On Sun, Aug 4, 2024 at 10:16 PM Andrew Nelson <andyfaff@gmail.com> wrote:
participants (3)
-
Andrew Nelson -
Charles R Harris -
Nathan