diff options
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -177,13 +177,13 @@ We develop and ship the current release of Chef off the master branch of this re If there is a critical fix you believe should be backported from master to a stable branch please follow these steps to backport your change: 1. Ask in the #chef-dev channel on [Chef Community Slack](https://community-slack.chef.io/) if this is an appropriate change to backport. -3. Inspect the Git history and find the `SHA` associated with the Merge Commit for the Pull Request above. -4. Apply the fix for the regression via a cherry-pick: - 1. Check out the stable release tag: `git checkout chef-13` +3. Inspect the Git history and find the `SHA`(s) associated with the fix. +4. Backport the fix to a branch via cherry-pick: + 1. Check out the stable release branch: `git checkout chef-13` 1. Create a branch for your backport: `git checkout -b my_great_bug_packport` 2. Cherry Pick the SHA with the fix: `git cherry-pick SHA` 3. Address any conflicts (if necessary) - 5. Push the new tag to origin: `git push origin` + 5. Push the new branch to your origin: `git push origin` 5. Open a PR for your backport 1. The PR title should be `Backport: ORIGINAL_PR_TEXT` 2. The description should link to the original PR and include a description of why it needs to be backported |