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 m
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 =
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,
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 r
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 h
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
