merge master before publishing site

ahmetgunes · Jan 22, 2015 · 7859017 · 7859017
1 parent 6478c27
commit 7859017
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/RoboFile.php b/RoboFile.php
@@ -126,6 +126,7 @@ public function publish()
         $this->stopOnFail();
         $this->taskGitStack()
             ->checkout('site')
+            ->merge('master')
             ->run();
         $this->_copy('CHANGELOG.md', 'docs/changelog.md');
         $this->_exec('mkdocs gh-deploy');