anchor.diff:  $ git fetch upstream
   ----
   
  -3. Push the latest changes, including your work, to your GitHub account:
  +3. Incorporate the commits from the remote repository, in this case
  +`openshift/openshift-docs`, into your local repository:
  ++
  +----
  +$ git rebase upstream/master
  +----
  +
  +4. After confirming in your rebased local repository that your changes have been
  +merged, push the latest changes, including your work, to your GitHub account:
   +
   ----
   $ git push origin master
   ----
   
   == Add changes to an existing PR, if required
  -In some cases you might have to make changes to a PR that you have already submitted. A PR can contain multiple commits, and we strive to preserve the review history and all discussions that occur around those commits. The following instructions describe how to make changes to an existing PR you have already submitted.
  -
  -1. Commit whatever updates you have made to the working branch by creating a new commit:
  +In some cases you might have to make changes to a PR that you have already
  +submitted. A PR can contain multiple commits, and we strive to preserve the
  +review history and all discussions that occur around those commits. The
  +following instructions describe how to make changes to an existing PR you have
  +already submitted.
  +
  +1. Commit whatever updates you have made to the working branch by creating a new
  +commit:
   +
   ----
   $ git commit -am "Detailed message as noted earlier"
   ----
   
  -2. To keep the Git history clean, you may be asked to rebase your PR and squash multiple commits into one commit. Before you push your changes in the next step, follow the instructions here to rebase: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request
  -
  -3. When you have rebased, push the latest updates to the local working branch to your GitHub account.
  +2. To keep the Git history clean, you may be asked to rebase your PR and squash
  +multiple commits into one commit. Before you push your changes in the next step,
  +follow the instructions here to rebase:
  +https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request
  +
  +3. After you have rebased, push the latest updates to the local working branch
  +to your GitHub account.
   +
   ----
   $ git push origin <working_branch> --force
   ----
   
  -The `--force` flag ignores whatever is on the remote server and replaces everything with the local copy. You should now see the new commits in the existing PR. Sometimes a refresh of the browser may be required.
  +The `--force` flag ignores whatever is on the remote server and replaces
  +everything with the local copy. You should now see the new commits in the
  +existing PR. Sometimes a refresh of your browser may be required.
   
   == Delete the local working branch
  -When you have confirmed that all of your changes have been accepted and merged, and you have pulled the latest changes on `master` and pushed them to your GitHub account, you can delete the local working branch. Ensure you are in your local repository before proceeding.
  +When you have confirmed that all of your changes have been accepted and merged,
  +and you have pulled the latest changes on `master` and pushed them to your
  +GitHub account, you can delete the local working branch. Ensure you are in your
  +local repository before proceeding.
   
   1. Delete the local working branch from your workstation.
   +
  
positive.code: $ git fetch upstream
  ----
  
  3. Push the latest updates to your forked repository so that it is also in sync with the remote:
  +
  ----
  $ git push origin master
  ----
  
  == Add new topics or update existing content on local branch 
  With your local and forked repositories in sync with the remote, you can now create a local working branch where you will make all your updates, or create any new content.
  
  *Step 1:* Create local branch
  
  The following command creates a new local branch and checks it out automatically. Be sure to replace <working_branch> with a suitable name. 
  
  ----
  $ git checkout -b <working_branch>
  ----
  
  [NOTE]
  This command creates a new specified branch and also checks it out, so you will automatically switch to the new branch.
  
  *Step 2:* Create new content or update existing content as required
  
  With the local branch created and checked out, you can now edit any content, or start adding new content.
  
  If you are creating a new topic, it is best to use the topic templates so that all of the required metadata is included:
  
  * For an Overview topic, use the https://github.com/openshift/openshift-docs/blob/master/contributing_to_docs/templates/overview_topic_template.adoc[Overview topic template].
  * For revision history topics, use the https://github.com/openshift/openshift-docs/blob/master/contributing_to_docs/templates/rev_history.adoc[Revision History Template].
  * For all other topics, use the https://github.com/openshift/openshift-docs/blob/master/contributing_to_docs/templates/topic_template.adoc[normal topic template].
  
  Otherwise, ensure that any new topic contains the required metadata as described in the link:doc_guidelines.adoc[documentation guidelines] topic, including naming and title conventions. 
  
  *Step 3:* Add all of your changes to a pending commit
  
  When you are finished making all of your changes, and have tested the updated or new content, the following command adds those changes to a pending commit.
  
  ----
  $ git add .
  
negative.code: ----
  $ git push origin :<working_branch>
  ----
  