From d9054df0a4aa148475cb85ca646ba911dac5daa9 Mon Sep 17 00:00:00 2001
From: mrugesh <1884376+raisedadead@users.noreply.github.com>
Date: Wed, 9 Oct 2019 16:48:14 +0530
Subject: [PATCH] docs: update devops guide

---
 docs/devops.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/devops.md b/docs/devops.md
index 38ff504ddd..c34ddc6418 100644
--- a/docs/devops.md
+++ b/docs/devops.md
@@ -49,7 +49,7 @@ The dev-team merges changes from the `production-staging` branch to `production-
 
 We use Azure Pipelines and other CI software (Travis, GitHub Actions), to continiously test and deploy our applications.
 
-### Triggering a build and deplyment
+### Triggering a build
 
 Currently we have given access only to the developer team to push to the production branches, beacuse of the automated deplyements on live sites. The changes to the `production-*` branches can land only via fast-forward merge to the [`upstream`](https://github.com/freeCodeCamp/freeCodeCamp). 
 
@@ -66,6 +66,8 @@ upstream	git@github.com:freeCodeCamp/freeCodeCamp.git (push)
 
 The below commands will move changes from `master` to the `production-*` branch:
 
+> #### :rotating_light: Do not run the below, if you have not confirmed Travis is green on the master branch :rotating_light:
+
 ```sh
 git checkout master
 git reset --hard upstream/master
@@ -76,6 +78,8 @@ git push upstream
 
 You will not be able to force push and if you have re-written the history in anyway it will error out. 
 
+### Triggering a deployment
+
 Once the changes are pushed, these should trigger our CI and CD pipilines:
 
 - Build Pipeline: https://dev.azure.com/freeCodeCamp-org/freeCodeCamp/_build