diff options
| author | Tushar Makkar <tushar@codenation.co.in> | 2016-11-07 10:12:23 +0530 |
|---|---|---|
| committer | Tushar Makkar <tushar@codenation.co.in> | 2016-11-07 10:12:23 +0530 |
| commit | cced5b62a654b0615bd21cd607fd0670003d32d3 (patch) | |
| tree | c1d971882785ad6a483b28715b90658a6b50f4eb /update_documentation.sh | |
| parent | 8de48276c2e6dafdfd739bbde1b673ee542f16a4 (diff) | |
| download | voluptuous-dev/auto-update-documentation.tar.gz | |
Fixing the errored out issuedev/auto-update-documentation
Diffstat (limited to 'update_documentation.sh')
| -rw-r--r-- | update_documentation.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/update_documentation.sh b/update_documentation.sh index 7651835..7f70cbf 100644 --- a/update_documentation.sh +++ b/update_documentation.sh @@ -34,12 +34,17 @@ echo "Checking out $FROM_BRANCH..." && \ git fetch origin ${FROM_BRANCH}:${FROM_BRANCH} && \ git checkout ${FROM_BRANCH} +echo "Pulling the $FROM_BRANCH branch" && \ +git pull && \ echo "Checking out $TO_BRANCH..." && \ # Checkout the latest stable git fetch origin ${TO_BRANCH}:${TO_BRANCH} && \ git checkout ${TO_BRANCH} && \ +echo "Pulling the $TO_BRANCH branch" && \ +git pull && \ + # Merge the dev into latest stable echo "Merging changes..." && \ git merge ${FROM_BRANCH} && \ |