I just put the apache/ part in there to make it extra clear which branch I was referring to.
On Tue, Feb 21, 2023 at 9:38 AM Joe Witt <[email protected]> wrote: > > Mike > > Yes it is. Just to avoid confusion the 'apache' part of that is just > what you have called the repo in your git config. The > 'support/nifi-1.x' line is the correct one though for what is > currently 1.21.0-SNAPSHOT. > > Just please be sure nothing goes there that doesn't also go to main > (2.0.0-SNAPSHOT) unless it is a bug fix for something only present on > 1.x line. > > Thanks > Joe > > On Tue, Feb 21, 2023 at 7:24 AM Mike Thomsen <[email protected]> wrote: > > > > Is apache/support/nifi-1.x the correct branch to merge 1.21+ changes to? > > > > Thanks, > > > > Mike
