I'm guessing it's time to fiddle local CPython clones to account for
master->main renaming now?

If so, I've seen two blobs of instructions, which are very similar but
not identical:

Blob 1 ("origin"):

"""
You just need to update your local clone after the branch name changes.
>From the local clone of the repository on a computer,
run the following commands to update the name of the default branch.

$ git branch -m master main
$ git fetch origin
$ git branch -u origin/main main

Apart from that, you should update any local script or command that uses
the name "master" to use the name "main".
"""

Blob 2 ("upstream"):

"""
The CPython repository's default branch was renamed from ``master`` to ``main``
after the Python 3.10b1 release. If you had cloned the repository before this
change, you can rename your local branch as follows::

    git branch -m master main
    git fetch upstream
    git branch -u upstream/main main
"""

>From my dim understanding, "upstream" makes more sense, but I don't
know. On my box:

"""
$ git remote -v
origin  https://github.com/tim-one/cpython (fetch)
origin  https://github.com/tim-one/cpython (push)
upstream        https://github.com/python/cpython (fetch)
upstream        https://github.com/python/cpython (push)
"""

so sync\ing with the universally shared "upstream" just makes more sense to me.

Right? Wrong? Do we need some mix of both? Something else?

I'd rather get it right the first time than try to untangle a mess
after the fact ;-)
_______________________________________________
Python-Dev mailing list -- python-dev@python.org
To unsubscribe send an email to python-dev-le...@python.org
https://mail.python.org/mailman3/lists/python-dev.python.org/
Message archived at 
https://mail.python.org/archives/list/python-dev@python.org/message/X3V42DYOHFLGAUPODFLXMYZWDE3VY47W/
Code of Conduct: http://python.org/psf/codeofconduct/

Reply via email to