N-archive/hacks-guide-minimal-mistakes-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change language

Browse source
This commit is contained in:
Michael Rose 2018-01-05 08:36:25 -05:00
parent 8a8235f8d7
commit 7bc9e5a47b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/_docs/04-upgrading.md
View file

@ -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: To add it you can do the following:
```bash ```terminal
$ git remote add upstream https://github.com/{{ site.repository }}.git git remote add upstream https://github.com/{{ site.repository }}.git
``` ```
### Pull Down Updates ### Pull Down Updates
Now you can pull any commits made to theme's `master` branch with: Now you can pull any commits made to theme's `master` branch with:
```bash ```terminal
$ git pull upstream master 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. 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.