GitHub pull request #1438 of commit eb44a7e614a9361bbb707de1d973ceaa844d3414, has merge conflicts.
Running as SYSTEM
Setting status of eb44a7e614a9361bbb707de1d973ceaa844d3414 to PENDING with url https://acdl.mit.edu/csi/job/CE_gpkit_PR_dependencies/2366/ and message: 'Testing... hold your breath...'
Using context: gpkit dependency tests
[EnvInject] - Loading node environment variables.
Building remotely on reynolds in workspace /jenkins/workspace/CE_gpkit_PR_dependencies@2
[WS-CLEANUP] Deleting project workspace...
[WS-CLEANUP] Deferred wipeout is used...
The recommended git tool is: NONE
using credential 3614a4cf-01de-4393-97de-73734b7dd5a2
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/gpkit
 > git init /jenkins/workspace/CE_gpkit_PR_dependencies@2 # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git --version # timeout=10
 > git --version # 'git version 2.7.4'
using GIT_SSH to set credentials 
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
using GIT_SSH to set credentials 
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse eb44a7e614a9361bbb707de1d973ceaa844d3414^{commit} # timeout=10
Merging Revision eb44a7e614a9361bbb707de1d973ceaa844d3414 (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 remote # timeout=10
 > git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials 
 > git merge --ff eb44a7e614a9361bbb707de1d973ceaa844d3414 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f eb44a7e614a9361bbb707de1d973ceaa844d3414 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff eb44a7e614a9361bbb707de1d973ceaa844d3414" returned status code 1:
stdout: Auto-merging gpkit/tests/t_nomials.py
Auto-merging gpkit/small_classes.py
CONFLICT (content): Merge conflict in gpkit/small_classes.py
Auto-merging gpkit/repr_conventions.py
CONFLICT (content): Merge conflict in gpkit/repr_conventions.py
Auto-merging gpkit/nomials/math.py
CONFLICT (content): Merge conflict in gpkit/nomials/math.py
Auto-merging gpkit/nomials/map.py
Auto-merging gpkit/nomials/core.py
CONFLICT (content): Merge conflict in gpkit/nomials/core.py
Auto-merging gpkit/constraints/sgp.py
CONFLICT (content): Merge conflict in gpkit/constraints/sgp.py
Auto-merging gpkit/constraints/gp.py
CONFLICT (content): Merge conflict in gpkit/constraints/gp.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
The recommended git tool is: NONE
using credential 3614a4cf-01de-4393-97de-73734b7dd5a2
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/gpkit
 > git init /jenkins/workspace/CE_gpkit_PR_dependencies@2 # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git --version # timeout=10
 > git --version # 'git version 2.7.4'
using GIT_SSH to set credentials 
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
using GIT_SSH to set credentials 
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse eb44a7e614a9361bbb707de1d973ceaa844d3414^{commit} # timeout=10
Merging Revision eb44a7e614a9361bbb707de1d973ceaa844d3414 (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 remote # timeout=10
 > git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials 
 > git merge --ff eb44a7e614a9361bbb707de1d973ceaa844d3414 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f eb44a7e614a9361bbb707de1d973ceaa844d3414 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff eb44a7e614a9361bbb707de1d973ceaa844d3414" returned status code 1:
stdout: Auto-merging gpkit/tests/t_nomials.py
Auto-merging gpkit/small_classes.py
CONFLICT (content): Merge conflict in gpkit/small_classes.py
Auto-merging gpkit/repr_conventions.py
CONFLICT (content): Merge conflict in gpkit/repr_conventions.py
Auto-merging gpkit/nomials/math.py
CONFLICT (content): Merge conflict in gpkit/nomials/math.py
Auto-merging gpkit/nomials/map.py
Auto-merging gpkit/nomials/core.py
CONFLICT (content): Merge conflict in gpkit/nomials/core.py
Auto-merging gpkit/constraints/sgp.py
CONFLICT (content): Merge conflict in gpkit/constraints/sgp.py
Auto-merging gpkit/constraints/gp.py
CONFLICT (content): Merge conflict in gpkit/constraints/gp.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
The recommended git tool is: NONE
using credential 3614a4cf-01de-4393-97de-73734b7dd5a2
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/gpkit
 > git init /jenkins/workspace/CE_gpkit_PR_dependencies@2 # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git --version # timeout=10
 > git --version # 'git version 2.7.4'
using GIT_SSH to set credentials 
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
using GIT_SSH to set credentials 
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse eb44a7e614a9361bbb707de1d973ceaa844d3414^{commit} # timeout=10
Merging Revision eb44a7e614a9361bbb707de1d973ceaa844d3414 (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 remote # timeout=10
 > git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials 
 > git merge --ff eb44a7e614a9361bbb707de1d973ceaa844d3414 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f eb44a7e614a9361bbb707de1d973ceaa844d3414 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff eb44a7e614a9361bbb707de1d973ceaa844d3414" returned status code 1:
stdout: Auto-merging gpkit/tests/t_nomials.py
Auto-merging gpkit/small_classes.py
CONFLICT (content): Merge conflict in gpkit/small_classes.py
Auto-merging gpkit/repr_conventions.py
CONFLICT (content): Merge conflict in gpkit/repr_conventions.py
Auto-merging gpkit/nomials/math.py
CONFLICT (content): Merge conflict in gpkit/nomials/math.py
Auto-merging gpkit/nomials/map.py
Auto-merging gpkit/nomials/core.py
CONFLICT (content): Merge conflict in gpkit/nomials/core.py
Auto-merging gpkit/constraints/sgp.py
CONFLICT (content): Merge conflict in gpkit/constraints/sgp.py
Auto-merging gpkit/constraints/gp.py
CONFLICT (content): Merge conflict in gpkit/constraints/gp.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Retrying after 10 seconds
The recommended git tool is: NONE
using credential 3614a4cf-01de-4393-97de-73734b7dd5a2
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository https://github.com/convexengineering/gpkit
 > git init /jenkins/workspace/CE_gpkit_PR_dependencies@2 # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
 > git --version # timeout=10
 > git --version # 'git version 2.7.4'
using GIT_SSH to set credentials 
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url https://github.com/convexengineering/gpkit # timeout=10
Fetching upstream changes from https://github.com/convexengineering/gpkit
using GIT_SSH to set credentials 
 > git fetch --tags --progress https://github.com/convexengineering/gpkit +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 > git rev-parse eb44a7e614a9361bbb707de1d973ceaa844d3414^{commit} # timeout=10
Merging Revision eb44a7e614a9361bbb707de1d973ceaa844d3414 (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 remote # timeout=10
 > git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials 
 > git merge --ff eb44a7e614a9361bbb707de1d973ceaa844d3414 # timeout=10
 > git config core.sparsecheckout # timeout=10
 > git checkout -f eb44a7e614a9361bbb707de1d973ceaa844d3414 # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff eb44a7e614a9361bbb707de1d973ceaa844d3414" returned status code 1:
stdout: Auto-merging gpkit/tests/t_nomials.py
Auto-merging gpkit/small_classes.py
CONFLICT (content): Merge conflict in gpkit/small_classes.py
Auto-merging gpkit/repr_conventions.py
CONFLICT (content): Merge conflict in gpkit/repr_conventions.py
Auto-merging gpkit/nomials/math.py
CONFLICT (content): Merge conflict in gpkit/nomials/math.py
Auto-merging gpkit/nomials/map.py
Auto-merging gpkit/nomials/core.py
CONFLICT (content): Merge conflict in gpkit/nomials/core.py
Auto-merging gpkit/constraints/sgp.py
CONFLICT (content): Merge conflict in gpkit/constraints/sgp.py
Auto-merging gpkit/constraints/gp.py
CONFLICT (content): Merge conflict in gpkit/constraints/gp.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Setting status of eb44a7e614a9361bbb707de1d973ceaa844d3414 to FAILURE with url https://acdl.mit.edu/csi/job/CE_gpkit_PR_dependencies/2366/ and message: 'Shucks... didn't pass the tests...
 '
Using context: gpkit dependency tests
Finished: FAILURE