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 -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/numpy-discussion.python.org/
Member address: [email protected]
