From 672ebd6c0323697eac9fc18384ac0a5656483114 Mon Sep 17 00:00:00 2001
From: mark <markm@cs.wisc.edu>
Date: Fri, 5 Jun 2020 10:27:18 -0500
Subject: [PATCH] do a rebase before testing

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e4a72f7c6..3e5febe30 100644
--- 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: