Those 10 commit are already in master. If we cherry pick the 2 release commits onto master, then that is wrong. Then it looks like the release contains those 10 new commits.
If we do a merge, then we'll have the two release commits in the right spot, then the 10 commits, then a "merge commit". --Aaron On Thu, Oct 5, 2017 at 5:34 AM Smith, Andrew <[email protected]> wrote: > I'd like to avoid a force. Could we cherry-pick those 10 commits over to > master? > > -----Original Message----- > From: Aaron D. Mihalik [mailto:[email protected]] > Sent: Thursday, October 05, 2017 1:17 PM > To: [email protected] > Subject: Merging Release back into Master? > > Hey devs, > > How are we going to handle merging the release back into master? master > has moved ahead since David marked the release and now the release branch > is "2 commits ahead, 10 commits behind master." [1] > > I propose pulling the 10 commits added to master on top of the release > branch and then doing a force push of that onto master. what do you all > think? > > --Aaron > > > [1] > https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_apache_incubator-2Drya_tree_3.2.11-2DRC3&d=DwIBaQ&c=Nwf-pp4xtYRe0sCRVM8_LWH54joYF7EKmrYIdfxIq10&r=U_RyVeYU_SBiw95AO0whBC3KHS5T7hkPx7rmMyjITF8&m=jWxjJgDMdB609alFiB_tKpRXzhLKdCmeM1o5d2GtOCI&s=XudaZE5HhUvHFqSzPwlwopkmViRx73iFyQ2iP_gOtxE&e= >
