Merged the 2.5.0 changes that were in master but not in next (for docs)
On Thu, Feb 21, 2013 at 5:04 PM, Michael Brooks mich...@michaelbrooks.cawrote:
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
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
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.cawrote:
TLDR; Yes
My understanding is that any commits that you want to appear in the next
release, then put them
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
