GitHub pull request #21 of commit 348ced8fbef7735f274170333630e16923f711c2, has merge conflicts.
Setting status of 348ced8fbef7735f274170333630e16923f711c2 to PENDING with url https://acdl.mit.edu/csi/job/gpkit_ResearchModel_jho_PR/29/ and message: 'Running TESTS... hold your breath...'
Using context: TESTS
Building remotely on reynolds in workspace /jenkins/workspace/gpkit_ResearchModel_jho_PR
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/jho
 > git init /jenkins/workspace/gpkit_ResearchModel_jho_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/jho
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/jho +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url https://github.com/convexengineering/jho # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/jho # timeout=10
Fetching upstream changes from https://github.com/convexengineering/jho
 > git fetch --tags --progress https://github.com/convexengineering/jho +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
 > git rev-parse 348ced8fbef7735f274170333630e16923f711c2^{commit} # timeout=10
Merging Revision 348ced8fbef7735f274170333630e16923f711c2 (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='default', fastForwardMode='--ff'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git merge --ff 348ced8fbef7735f274170333630e16923f711c2 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 348ced8fbef7735f274170333630e16923f711c2 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 348ced8fbef7735f274170333630e16923f711c2" returned status code 1:
stdout: Auto-merging model/jho.py
CONFLICT (content): Merge conflict in model/jho.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/jho
 > git init /jenkins/workspace/gpkit_ResearchModel_jho_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/jho
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/jho +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url https://github.com/convexengineering/jho # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/jho # timeout=10
Fetching upstream changes from https://github.com/convexengineering/jho
 > git fetch --tags --progress https://github.com/convexengineering/jho +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
 > git rev-parse 348ced8fbef7735f274170333630e16923f711c2^{commit} # timeout=10
Merging Revision 348ced8fbef7735f274170333630e16923f711c2 (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='default', fastForwardMode='--ff'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git merge --ff 348ced8fbef7735f274170333630e16923f711c2 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 348ced8fbef7735f274170333630e16923f711c2 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 348ced8fbef7735f274170333630e16923f711c2" returned status code 1:
stdout: Auto-merging model/jho.py
CONFLICT (content): Merge conflict in model/jho.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/jho
 > git init /jenkins/workspace/gpkit_ResearchModel_jho_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/jho
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/jho +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url https://github.com/convexengineering/jho # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/jho # timeout=10
Fetching upstream changes from https://github.com/convexengineering/jho
 > git fetch --tags --progress https://github.com/convexengineering/jho +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
 > git rev-parse 348ced8fbef7735f274170333630e16923f711c2^{commit} # timeout=10
Merging Revision 348ced8fbef7735f274170333630e16923f711c2 (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='default', fastForwardMode='--ff'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git merge --ff 348ced8fbef7735f274170333630e16923f711c2 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 348ced8fbef7735f274170333630e16923f711c2 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 348ced8fbef7735f274170333630e16923f711c2" returned status code 1:
stdout: Auto-merging model/jho.py
CONFLICT (content): Merge conflict in model/jho.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/jho
 > git init /jenkins/workspace/gpkit_ResearchModel_jho_PR # timeout=10
Fetching upstream changes from https://github.com/convexengineering/jho
 > git --version # timeout=10
 > git fetch --tags --progress https://github.com/convexengineering/jho +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url https://github.com/convexengineering/jho # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/jho # timeout=10
Fetching upstream changes from https://github.com/convexengineering/jho
 > git fetch --tags --progress https://github.com/convexengineering/jho +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
 > git rev-parse 348ced8fbef7735f274170333630e16923f711c2^{commit} # timeout=10
Merging Revision 348ced8fbef7735f274170333630e16923f711c2 (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='default', fastForwardMode='--ff'}
 > git rev-parse origin/master^{commit} # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master # timeout=3
 > git merge --ff 348ced8fbef7735f274170333630e16923f711c2 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f 348ced8fbef7735f274170333630e16923f711c2 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 348ced8fbef7735f274170333630e16923f711c2" returned status code 1:
stdout: Auto-merging model/jho.py
CONFLICT (content): Merge conflict in model/jho.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Setting status of 348ced8fbef7735f274170333630e16923f711c2 to FAILURE with url https://acdl.mit.edu/csi/job/gpkit_ResearchModel_jho_PR/29/ and message: 'Shucks... didn't pass the TESTS...
 '
Using context: TESTS
Finished: FAILURE