I've just rebased my checkout of the runtime2-2202 branch on the latest changes in the master branch and made a minimum set of changes to fix compilation errors and test failures. I've verified there are no remaining issues before force-pushing my rebased commits to the Daffodil git repository. If you have checked out the runtime2-2202 branch, you will need to update your checkout of the branch using "git pull --rebase" in order to get my rebased commits without any error messages.
John -----Original Message----- From: Interrante, John A (GE Research, US) <john.interra...@ge.com> Sent: Saturday, March 27, 2021 2:59 PM To: dev@daffodil.apache.org Subject: EXT: Rebase runtime2-2202 on asf/master soon 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
