Deploying commits to the production branch on Github - buttonmen-dev/buttonmen GitHub Wiki

To mirror the dev branch to the production branch

  • Create a pull request on Github to 'production' from 'master' and accept it, OR
  • git fetch upstream; git checkout upstream/production; git merge upstream/master; git push upstream/production

To mirror some previous state of the dev branch to the production branch

  • git fetch upstream; git checkout CommitHash; git push upstream/production (perhaps with the --force flag if necessary)

To change only the production branch

  • Create a pull request to 'production' from a local repo.

To adopt only a specific commit from the dev branch to the production branch

  • git fetch upstream; git checkout upstream/production; git cherry-pick CommitHash; git push upstream/production