do a rebase before testing (#737)

mark-i-m · web-flow · commit a960baa49f38 · 2020-06-05T14:42:45.000-03:00
diff --git 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:
