As much as I agree with this sentiment and personally dislike the naming "origin/upstream" as well, it is the most widespread naming convention in the fork model. See e.g https://docs.scipy.org/doc/scipy/dev/gitwash/development_setup.html I think its a good idea to stick to the established convention in the sagemath documentation.
If you first cloned the main repo and then decide to fork, the common approach is to rename the origin remote to upstream and introduce a new origin pointing to the fork. The gh cli is doing this automatically, see https://cli.github.com/manual/examples ("Forking repositories"). On Sunday, 11 September 2022 at 19:06:25 UTC+2 Matthias Koeppe wrote: > Hi Tobias, > Thanks a lot for your edits to the wiki page! > Some comments: > 1) In our documentation, we should avoid referring to "origin" as the > remote, because what is "origin" will depend on whether someone cloned the > repo before deciding that they need their own fork. This is why I used > "github-USERNAME" as the name of the remote. It makes it clear to > developers what is what. > 2) Likewise, the word "upstream" is heavily overloaded in our use. I would > recommend to call this remote just "sagemath" or something like this for > clarity. > > > On Sunday, September 11, 2022 at 12:17:24 AM UTC-7 tobias...@gmail.com > wrote: > >> On Saturday, 10 September 2022 at 21:32:50 UTC+2 Matthias Koeppe wrote: >> >>> On Saturday, September 10, 2022 at 8:12:48 AM UTC-7 Matthias Koeppe >>> wrote: >>> >>>> I've added a draft of a proposed workflow on GitHub with the idea to >>>> just follow the Trac workflow. >>>> Help is welcome in adding links to documentation for the various bits. >>>> >>>> I think we can have a fleshed out Trac to GitHub transition guide by >>>> the end of the weekend. >>>> >>>> >>> A draft of the Trac-to-GitHub transition guide is now available at: >>> https://github.com/sagemath/sage/wiki/migration-from-trac-to-Git**b >>> >>> Please let me know what's missing or unclear. >>> >>> >> >> Thanks, this is already in a pretty nice shape! I've extended some points >> a bit. >> >> In my opinion, we can also directly drop the develop branch and move to >> the master/main-branch only model. But that's slightly orthogonal to the >> migration to Github. >> > -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/4d039b11-ad50-49e0-9338-9fca7fe7e454n%40googlegroups.com.
