The PRs should be mergeable to main automatically as I _moved_ the branch rather than copying it, so unless there are new code conflicts, there shouldn’t be a problem. There are tools from other developers [1] which can automate the process of rebasing, but in general I don’t think this is necessary.
For anyone who wishes to relabel their local working copy branches, you can follow these instructions from [2]. If someone has a local clone, then can update their locals <https://twitter.com/xunit/status/1269881005877256192> like this: $ git checkout master $ git branch -m master main $ git fetch $ git branch --unset-upstream $ git branch -u origin/main $ git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main I will send new updates when the other NiFi subprojects (Registry, MiNiFi Java, MiNiFi C++, and FDS) have had their default branches renamed. [1] https://github.com/ethomson/retarget_prs <https://github.com/ethomson/retarget_prs> [2] https://www.hanselman.com/blog/EasilyRenameYourGitDefaultBranchFromMasterToMain.aspx <https://www.hanselman.com/blog/EasilyRenameYourGitDefaultBranchFromMasterToMain.aspx> Andy LoPresto alopre...@apache.org alopresto.apa...@gmail.com He/Him PGP Fingerprint: 70EC B3E5 98A6 5A3F D3C4 BACE 3C6E F65B 2F7D EF69 > On Jul 7, 2020, at 9:14 AM, Matt Burgess <mattyb...@apache.org> wrote: > > IMO that's a yes, the branch is created and now main has more commits > than master and is the "source of truth". We should be using main as > the default branch (the way it is in Github now), rebasing PRs atop > main and changing the PRs in Github to have main as the base branch > (so no mistakes are made when merging). With any luck master just kind > of fades away, or perhaps at some point we just delete it. > > With some scripting we should be able to automate such PR updates, but > personally it felt a little heavy-handed so I haven't written said > script(s). Instead I'm just updating my own PRs and when I review > someone's, I'm leaving a comment to please switch over to main as the > base branch (both in the code and the PR). > > That's just my two cents though, happy to discuss further. I think we > really just need to avoid updating the master branch from here on out > rather than trying to keep them in sync, or even worse having them > diverge each with new commits that aren't in the other. > > Regards, > Matt > > On Tue, Jul 7, 2020 at 12:06 PM Otto Fowler <ottobackwa...@gmail.com> wrote: >> >> So, is that a yes? >> >> On July 7, 2020 at 10:53:59, Matt Burgess (mattyb...@apache.org) wrote: >> >> Thanks Mike! I rebased against main since that's our default branch >> from now on, so should be ok now. >> >> On Tue, Jul 7, 2020 at 10:52 AM Mike Thomsen <mikerthom...@gmail.com> >> wrote: >>> >>> I'll take it. >>> >>> On Tue, Jul 7, 2020 at 9:57 AM Matt Burgess <mattyb...@apache.org> wrote: >>> >>>> I've got a PR [1] that's approaching 1.5 years since the last update, >>>> but it should be good to go and fairly straightforward to test, any >>>> takers? :) I just rebased it against the laster master branch, should >>>> I be using main as of this point, or is there more work to be done >>>> before we switch over? >>>> >>>> Thanks, >>>> Matt >>>> >>>> [1] https://github.com/apache/nifi/pull/2718 >>>> >>>> On Tue, Jul 7, 2020 at 5:48 AM Mike Thomsen <mikerthom...@gmail.com> >>>> wrote: >>>>> >>>>> Might also be a good time to think about closing out old PRs (like >> age > >>>>> 1.5 years). >>>>> >>>>> On Mon, Jul 6, 2020 at 10:49 PM Otto Fowler <ottobackwa...@gmail.com> >>>> wrote: >>>>> >>>>>> So, should we rebase our outstanding PR’s? Should all outstanding >>>> PR’s >>>>>> get a note? >>>>>> >>>>>> On July 6, 2020 at 17:57:25, Andy LoPresto (alopre...@apache.org) >>>> wrote: >>>>>> >>>>>> Apache Infra completed the change. Everything looks ok from my end >> but >>>> as I >>>>>> made the initial change, can someone else verify that their local >> repo >>>> is >>>>>> good to go? Once that’s done, I’ll update the committer guide and >>>> GitHub PR >>>>>> template with the new language, and check the CI/CD for GitHub >> Actions >>>> too. >>>>>> Thanks. br/> < >>>>>> >>>>>> Andy LoPresto >>>>>> alopre...@apache.org >>>>>> alopresto.apa...@gmail.com >>>>>> He/Him >>>>>> PGP Fingerprint: 70EC B3E5 98A6 5A3F D3C4 BACE 3C6E F65B 2F7D EF69 >>>>>> >>>>>>> On Jul 6, 2020, at 11:02 AM, Joe Witt <joe.w...@gmail.com> wrote: >>>>>>> br/>> Looking into this we might be fine. We use thee github >> 'default >>>>>> branch' >>>>>>> which I think you'll get changed by the INFRA ticket. >>>>>>> br/>> We then might want to look at >>>>>> https://github.coom/ethomson/retarget_prs >>>>>>> br/>> Thanks < >>>>>>> br/>> On Mon, Jul 6, 2020 at 9:21 AM Joe Witt <jooe.w...@gmail.com> >> >>>>>> wrote: >>>>>>> br/>>> Andy < >>>>>>>> br/>>> I *think* we need to change the githubb actions config a >>>> little >>>>>> bit as >>>>>>>> well. It defaults to master I believe and we can specify an >>>> alternative >>>>>>>> branch of 'main'. Maybe we just keep an eye on it and see if >> there >>>> is a >>>>>>>> material difference. One example is the 'build passing' >> indicator >>>> comes >>>>>>>> from master unless you override it (as I've read previously). >>>>>>>> br/>>> Thanks < >>>>>>>> br/>>> On Mon, Jul 6, 2020 at 9:18 AM Andy LooPresto < >>>>>> alopre...@apache.org> wrote: >>>>>>>> br/>>>> It appears that we don’t havee 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. >>>>>>>>> br/>>>> br/>>>> Andy LoPresto < >>>>>>>>> alopre...@apache.org >>>>>>>>> alopresto.apa...@gmail.com >>>>>>>>> He/Him >>>>>>>>> PGP Fingerprint: 70EC B3E5 98A6 5A3F D3C4 BACE 3C6E F65B 2F7D >> EF69 >>>>>>>>> br/>>>>> On Jul 4, 2020, at 11:57 AMM, Joey Frazee >>>>>> <joey.fra...@icloud.com.INVALID> >>>>>>>>> wrote: >>>>>>>>>> br/>>>>> @@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? >>>>>>>>>> br/>>>>> -joey < >>>>>>>>>> On Jul 2, 2020, 6:39 PM -0500, alopre...@apache.org, wrote: >>>>>>>>>>> This is an automated email from the ASF dual-hosted git >>>> repository. >>>>>>>>>>> br/>>>>>> alopresto pusheed a change to branch main >>>>>>>>>>> in repository https://gitbox.apache.org/repos/asf/nifi.git. >>>>>>>>>>> br/>>>>>> br/>>>>>> at 239a2e8 NIFFI-7513 Added custom DNS >>>> resolution >>>>>> steps to walkthrough >>>>>>>>> (#4359) >>>>>>>>>>> br/>>>>>> No new revisionns were added by this update. >>>>>>>>>>> br/>>>> br/>>>> br/> < >>>>>> >>>>
