From 7bc9e5a47b5fb2cb60ed9625447fa28a5cb06ac4 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Fri, 5 Jan 2018 08:36:25 -0500 Subject: [PATCH] Change language --- docs/_docs/04-upgrading.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/_docs/04-upgrading.md b/docs/_docs/04-upgrading.md index a910c682..28dbe963 100644 --- a/docs/_docs/04-upgrading.md +++ b/docs/_docs/04-upgrading.md @@ -43,16 +43,16 @@ To double check, run `git remote -v` and verify that you can fetch from `origin To add it you can do the following: -```bash -$ git remote add upstream https://github.com/{{ site.repository }}.git +```terminal +git remote add upstream https://github.com/{{ site.repository }}.git ``` ### Pull Down Updates Now you can pull any commits made to theme's `master` branch with: -```bash -$ git pull upstream master +```terminal +git pull upstream master ``` Depending on the amount of customizations you've made after forking, there's likely to be merge conflicts. Work through any conflicting files Git flags, staging the changes you wish to keep, and then commit them.