From 56d4bc40ea33d1b29191d04a1caf49e10569cbbb Mon Sep 17 00:00:00 2001 From: Magicansk <30593595+magicansk@users.noreply.github.com> Date: Wed, 25 Oct 2017 01:15:56 +0800 Subject: [PATCH] fix(docs): Update Contributing Guidelines (#16025) --- CONTRIBUTING.md | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 77d974d52fa..1b727d45ae3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -108,33 +108,32 @@ Do this prior to every time you create a branch for a PR: 1. Make sure you are on the `staging` branch - > ```shell - > $ git status - > On branch staging - > Your branch is up-to-date with 'origin/staging'. - > ``` + ```shell + $ git status + On branch staging + Your branch is up-to-date with 'origin/staging'. + ``` + If your aren't on `staging`, resolve outstanding files / commits and checkout the `staging` branch - > If your aren't on `staging`, resolve outstanding files / commits and checkout the `staging` branch - - > ```shell - > $ git checkout staging - > ``` + ```shell + $ git checkout staging + ``` 2. Do a pull with rebase against `upstream` - > ```shell - > $ git pull --rebase upstream staging - > ``` + ```shell + $ git pull --rebase upstream staging + ``` - > This will pull down all of the changes to the official staging branch, without making an additional commit in your local repo. + This will pull down all of the changes to the official staging branch, without making an additional commit in your local repo. 3. (_Optional_) Force push your updated staging branch to your GitHub fork - > ```shell - > $ git push origin staging --force - > ``` + ```shell + $ git push origin staging --force + ``` - > This will overwrite the staging branch of your fork. + This will overwrite the staging branch of your fork. ### Create A Branch