Skip to content

Commit

Permalink
Minor update to git syntax in update section #14
Browse files Browse the repository at this point in the history
  • Loading branch information
maskingtape committed Jul 11, 2012
1 parent 03a3d6b commit 3005199
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,12 @@ First recreate the link between your project and `dharmafly-docs`

`git remote add dharmafly-docs git@github.com:dharmafly/dharmafly-docs.git`

Making sure you are in your project's gh-page branch, pull from the
Making sure you are in your project's `gh-pages` branch, pull from the
Dharmafly Docs master branch

`git pull origin dharmafly-docs-master`

You may find minor merge conflicts occur. This would more than likely be
in the _config.yml.
This is because it is a file you the implementer edits but is also prone to development changes.
`git pull dharmafly-docs master`

You may find minor merge conflicts occur in the `_config.yml`, as it needs to be updated for a project website instance, but is likely to be updated and enhanced in the Dharmafly Docs` `master` branch.

How can I update the styling or format of all Dharmafly project websites?
------------------------------
Expand Down

0 comments on commit 3005199

Please sign in to comment.