Set version to 0.6.0

CHANGES.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+0.6.0 (2018-11-19)
+------------------
+### Changed
+- Explain that it is okay to have a merge commit for pull requests.
+
+### Fixed
+- Describe `git pull` instead of `git merge` in the "Keep Your Fork
+  Updated" section.
+
+
 0.5.0 (2018-10-17)
 ------------------
 ### Changed

README.md

@@ -9,18 +9,18 @@ Fork and Pull Request Workflow
 [SHIELD_PDF]: https://img.shields.io/badge/download-PDF-brightgreen.svg
 [SHIELD_TXT]: https://img.shields.io/badge/download-TXT-brightgreen.svg
 [SHIELD_CCBY]: https://img.shields.io/badge/license-CC%20BY%204.0-blue.svg
-[DOWNLOAD_PDF]: https://github.com/susam/gitpr/releases/download/0.5.0/gitpr.pdf
-[DOWNLOAD_TXT]: https://github.com/susam/gitpr/releases/download/0.5.0/gitpr.txt
+[DOWNLOAD_PDF]: https://github.com/susam/gitpr/releases/download/0.6.0/gitpr.pdf
+[DOWNLOAD_TXT]: https://github.com/susam/gitpr/releases/download/0.6.0/gitpr.txt
 <!-- :: \fi -->
-<!-- Version 0.5.0 (2018-11-19) -->
+<!-- Version 0.6.0 (2018-11-19) -->
 <!-- :: \maketitle -->
 
 This document describes how developers may contribute pull requests to
 an upstream repository and how upstream owners may merge pull requests
 from contributors according to the very popular fork and pull request
 workflow followed in many projects on GitHub.
 
-The download buttons above download version 0.5.0 <!-- x -->
+The download buttons above download version 0.6.0 <!-- x -->
 (the latest stable release) of this document. <!-- x -->
 <!-- x -->
 The most recent version of this document is available at