juju/docs — pull request #82 by marcoceppi (2014-04-22 14:32:55+00:00)
Title: Removed htmldocs

This removes all HTML files from the htmldocs directory and adds htmldocs/*.html to the gitignore list.

# Help! When I attempted to sync with upstream I got merge conflicts in my HTML

Since we're removing the rendered html files from the repository, if you have changes since the last commit, you'll get a conflict

## I have made edits to HTML files directly

If you have modified any of the HTML files directly you'll first need to place those edits into the corresponding markdown files. For large files, run the following command (after installing `python-html2text`)

html2markdown -b 80 -i -d htmldocs/

Where `` is the file you've edited. This will produce the corresponding Markdow of that file, which will allow you to copy and paste the chunks of the file you've modified.

## I was just running `make build`

If you haven't placed your edits directly in the htmldocs directory, simply run

git checkout -- htmldocs/*.html

This will reset your changes to the last commit, allowing you to once again pull/merge from upstream.