Steve,

I'm fine with adding the Daffodil repos to the Conscious Language Checker scans 
(opt-in) since we've already done the work.

I noticed your instructions for updating local checkouts of forked repos differ 
slightly from the instructions I see on GitHub after I rename my forked repo's 
default branch to 'main'.  After I follow GitHub's instructions, my checkout's 
main branch keeps pointing to my forked repo's main branch like it did before:

On branch main
Your branch is up to date with 'origin/main'.

After I follow your instructions, my checkout's main branch points to Apache 
Daffodil's upstream repo's main branch instead:

On branch main
Your branch is up to date with 'asf/main'.

Is that orientation really advisable?  Sure, it would be nice to avoid needing 
to rebase my checkout's main branch on asf/main every now and then to keep my 
main branch in sync, but if I push anything from my checkout's main branch, it 
could go directly to the upstream repo instead of my forked repo.  

I prefer to have two checkouts instead, one named "daffodil-asf" which tracks 
the upstream repo and another named "daffodil-tuxsf" which tracks my forked 
repo with "origin" set to my repo and "asf" set to the upstream repo.  If I 
ever need to push directly to the upstream repo (say to create a new upstream 
branch), I'll do it in daffodil-asf, otherwise I'll do all of my work and git 
pushes in daffodil-tuxsf with the certainty that everything I push goes to my 
forked repo, not the upstream repo.

John

Reply via email to