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 <andyf...@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. > > > _______________________________________________ > 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: nathan12...@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
