It appears that we don’t have the ability to switch the default branch ourselves; I’ve filed https://issues.apache.org/jira/browse/INFRA-20487 <https://issues.apache.org/jira/browse/INFRA-20487> requesting Apache Infra takes care of that. Until that time, committers _should_ merge the code to main but I will monitor to ensure we keep the branches in sync. The history was moved, the only remaining step is GitHub being aware of the default branch change.
Andy LoPresto [email protected] [email protected] He/Him PGP Fingerprint: 70EC B3E5 98A6 5A3F D3C4 BACE 3C6E F65B 2F7D EF69 > On Jul 4, 2020, at 11:57 AM, Joey Frazee <[email protected]> > wrote: > > @alopresto Do you want everyone individually pushing to both master and main > or are you intending to keep it in sync until it’s made the default? > > -joey > On Jul 2, 2020, 6:39 PM -0500, [email protected], wrote: >> This is an automated email from the ASF dual-hosted git repository. >> >> alopresto pushed a change to branch main >> in repository https://gitbox.apache.org/repos/asf/nifi.git. >> >> >> at 239a2e8 NIFI-7513 Added custom DNS resolution steps to walkthrough (#4359) >> >> No new revisions were added by this update. >>
