Yea, ideally fast-forward merged to preserve the SHA. If that's not possible, then cherry-picked.
On Thu, Feb 21, 2013 at 4:54 PM, Shazron <shaz...@gmail.com> wrote: > Cool - then those two commits should be cherry-picked into next since they > are part of the next release > > > On Thu, Feb 21, 2013 at 4:53 PM, Michael Brooks <mich...@michaelbrooks.ca > >wrote: > > > TLDR; Yes > > > > My understanding is that any commits that you want to appear in the > "next" > > release, then put them into next. > > > > All commits into "next" will eventually be merged into "master" as well > for > > the future releases. > > > > Michael > > > > On Thu, Feb 21, 2013 at 4:27 PM, Shazron <shaz...@gmail.com> wrote: > > > > > Should these two commits be in next as well since they are to be > released > > > with 2.5.0? > > > > > > > > > > > > https://git-wip-us.apache.org/repos/asf?p=cordova-docs.git;a=commit;h=d2cce8fdc5d3343702d89868c04805bfc662b1c8 > > > > > > > > > https://git-wip-us.apache.org/repos/asf?p=cordova-docs.git;a=commit;h=b58149ed332ecc14ed46cf73b60734a0e15d1816 > > > > > >
