docs-redis's Introduction

docs-redis

Update documentation using the branches as follows:

Master

This is the main 'going forward' branch, and contains the next unreleased version. This branch builds to the
cf-services-edge > redis-edge pipeline, and does not go to production until release time.

Update this branch for any 'going-forward' changes:
- New features in next release
- Reorganization, Enhancements
- Doc bug fixes
If appropriate cherry-pick or copy your changes from master to 'live' branches (in production), for example 1.9.

Other branches in production (e.g., 1.9)

These branches build to the cf-services > redis pipeline, and are manually pushed to production as needed.

Update the branches in production as necessary to expose high priority content changes you made to the master branch, that also apply to live branches.

Example: If you forgot to document a 1.9 feature, document it first in the master branch, then cherry-pick the change to the 1.9 branch in production.
Fix doc bugs that affect customers in the live branches, after you've fixed them in the master branch first.

How to Cherry-pick from one Branch to Another

Make changes in the first branch (usually master), commit them, and then push them to the repo.
Copy part of the SHA for the above commit. To find this, you can do a git log, or look at the list of commits in the github repo.
Checkout the second branch, where you want to copy the changes you made in the first branch.
Run this command, using the SHA snippet you copied above: git cherry-pick <SHA_SNIPPET>

For example: git cherry-pick 5dc22fe00

Do the cherry-pick immediately to lessen the chances of conflicts. Otherwise, you may need to resolve conflicts in order to complete the cherry-pick.
Do a git push after the cherry-pick is complete.

Recommend Projects