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 <charlesr.har...@gmail.com>
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 <andyf...@gmail.com> wrote:
>
>> 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: 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
