do a rebase before testing (#737)

2020-06-05 12:42:45 -05:00 · 2020-06-05 12:42:45 -05:00 · 1bd1035ef5
parent 98d000fb3c
commit 1bd1035ef5
1 changed files with 1 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -14,6 +14,7 @@ install:
 - cargo install mdbook --version 0.3.7
 - cargo install mdbook-linkcheck --version 0.5.0
 script:
+- git rebase master # this will exit with an error on conflict
 - mdbook build
 notifications:
  email: