I want to warn any Daffodil developer who has checked out the runtime2-2202 
branch that I plan to rebase the runtime2-2202 branch on the latest asf/master 
branch and force-push the different commits to the runtime2-2202 branch.  I 
will wait 72 hours (until Tuesday, March 30) to make sure no one has any 
outstanding commits on this dev branch.  I will send another email after doing 
the force push to let people know they will need to update their branch using 
the "git pull -rebase" option in order to get the rebased commits.  I won't be 
creating a pull request for this dev branch rebase; I'll just verify that I 
made only a minimum set of changes to fix compilation errors and test failures 
and found no remaining issues before doing the force push.

I plan to make more commits on the runtime2-2202 branch after this rebase - in 
other words, I want to do some of the items on the runtime2-todos list before I 
make a pull request to merge the dev branch into the main branch.  If people 
are fine with it, I will push my individual rebased commits including the 
minimum set of changes I made to fix compilation errors and test failures and 
wait until later to squash my commits into a single commit.  OK with everyone?

John

Reply via email to