Skip to content

Cherry Picking Commits for Production Branch

Ryan Hodges edited this page Mar 18, 2016 · 1 revision

Why

Because several new features are being developed, tested, and demonstrated before we're ready to implement them in production Forest Planner has adopted a much more professional, but also more complicated deployment strategy: a separate 'production' branch of the code. Keeping all of these updates on separate branches could lead to obsolescence. However, pushing features straight to production that we might want behind a paywall, or may not want public for political reasons isn't a great strategy either. Instead, developing new features on separate branches, merging them into Master when we're ready, then cherry-picking the relevant commits into production seems to be the best model.

How

  1. Make a new branch
  2. Write your code and commit
  3. Merge with Master
  4. Test
  5. Check out vx.xproduction (x.x will change based on the version you want to run)
  6. git cherry-pick commitid where 'commitid' is the ID of the commit you wish to merge