El jue, 6 may 2021 a las 6:58, Skip Montanaro (<skip.montan...@gmail.com>)
escribió:

> > Your main branch in GitHub has some commits they are not in
> python/cpython.
> > https://github.com/smontanaro/cpython/commits/main
>
> Regarding this. How else am I to keep my fork in sync with
> python/cpython other than by the occasional pull upstream/push origin
> process? That's what all those merges are. Is that first commit
> (Github (un)Dependabot) the culprit, or are all the other git merge
> results also problematic?
>

Maybe others have different workflows, but I don't see much of a need for
keeping your fork's main branch up to date. My workflow is something like
this:

% git remote -v
origin g...@github.com:JelleZijlstra/cpython.git (fetch)
origin g...@github.com:JelleZijlstra/cpython.git (push)
upstream https://github.com/python/cpython.git (fetch)
upstream https://github.com/python/cpython.git (push)
% git checkout main
Already on 'main'
Your branch is up to date with 'upstream/main'.
% git pull
... get new changes from upstream
% git checkout -b myfeature
... write my code
% git push -u origin myfeature
... open a pull request

So my local main branch tracks upstream/main (the real CPython repo), not
origin/main (my fork).


>
> Skip
> _______________________________________________
> 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/AGUYBV54ZOBH6LJGABMOTLA4MEAXPWWY/
> Code of Conduct: http://python.org/psf/codeofconduct/
>
_______________________________________________
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/PQU2PWUG2WUHL44QKSIEC3BPUOZAZG6M/
Code of Conduct: http://python.org/psf/codeofconduct/

Reply via email to