Migration

Migrating projects to the new branching strategies is a simple task outlined below.

Note: The process applies to release deployment projects. Any legacy continuous deployment project simply follows the instructions here.

Migration Process

  1. Determine which branch is deployed to production.

    • For illustration purposes, let's say it's current-prod

  2. Merge current-prod into master

    Terminal

    $ git checkout master
$ git merge current-prod

  3. Create a develop branch off of master if none exists

    Terminal

    $ git checkout master
$ git checkout -b develop

  4. Notify your team branching & release Czar so that he or she can protect the following branches:

    • master
    • develop

Protected Branches

Github offers a feature called Protected Branches. We leverage this to make sure our core branches are safe.

To protect a branch, follow these instructions:

  1. Navigate to your Github repository
  2. Click on Settings and then on Branches in the left-hand navigation
  3. In the Protected branches section, configure both master and develop branches.