GitHub pull request #1546 of commit 49079432d011f7605035e10f02e2307c0542bedc, has merge conflicts.
Running as SYSTEM
Setting status of 49079432d011f7605035e10f02e2307c0542bedc to PENDING with url <a href='https://acdl.mit.edu/csi/job/CE_gpkit_PR_dependencies/2369/'>https://acdl.mit.edu/csi/job/CE_gpkit_PR_dependencies/2369/</a> and message: 'Testing... hold your breath...'
Using context: gpkit dependency tests
[EnvInject] - Loading node environment variables.
Building remotely on <a href='/csi/computer/reynolds' class='jenkins-table__link model-link model-link--float'>reynolds</a> in workspace /jenkins/workspace/CE_gpkit_PR_dependencies
[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 <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
 &gt; git init /jenkins/workspace/CE_gpkit_PR_dependencies # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
 &gt; git --version # timeout=10
 &gt; git --version # 'git version 2.25.1'
using GIT_SSH to set credentials 
 &gt; git fetch --tags --force --progress -- <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> +refs/heads/*:refs/remotes/origin/* # timeout=10
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> # timeout=10
 &gt; git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
using GIT_SSH to set credentials 
 &gt; git fetch --tags --force --progress -- <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 &gt; git rev-parse 49079432d011f7605035e10f02e2307c0542bedc^{commit} # timeout=10
Merging Revision 49079432d011f7605035e10f02e2307c0542bedc (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 &gt; git rev-parse origin/master^{commit} # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f origin/master # timeout=3
 &gt; git remote # timeout=10
 &gt; git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials 
 &gt; git merge --ff 49079432d011f7605035e10f02e2307c0542bedc # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f 49079432d011f7605035e10f02e2307c0542bedc # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 49079432d011f7605035e10f02e2307c0542bedc" returned status code 1:
stdout: Auto-merging gpkit/tests/t_examples.py
Auto-merging gpkit/solution_array.py
Auto-merging gpkit/constraints/sgp.py
CONFLICT (content): Merge conflict in gpkit/constraints/sgp.py
Auto-merging gpkit/constraints/prog_factories.py
Auto-merging 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 <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
 &gt; git init /jenkins/workspace/CE_gpkit_PR_dependencies # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
 &gt; git --version # timeout=10
 &gt; git --version # 'git version 2.25.1'
using GIT_SSH to set credentials 
 &gt; git fetch --tags --force --progress -- <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> +refs/heads/*:refs/remotes/origin/* # timeout=10
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> # timeout=10
 &gt; git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
using GIT_SSH to set credentials 
 &gt; git fetch --tags --force --progress -- <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 &gt; git rev-parse 49079432d011f7605035e10f02e2307c0542bedc^{commit} # timeout=10
Merging Revision 49079432d011f7605035e10f02e2307c0542bedc (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 &gt; git rev-parse origin/master^{commit} # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f origin/master # timeout=3
 &gt; git remote # timeout=10
 &gt; git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials 
 &gt; git merge --ff 49079432d011f7605035e10f02e2307c0542bedc # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f 49079432d011f7605035e10f02e2307c0542bedc # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 49079432d011f7605035e10f02e2307c0542bedc" returned status code 1:
stdout: Auto-merging gpkit/tests/t_examples.py
Auto-merging gpkit/solution_array.py
Auto-merging gpkit/constraints/sgp.py
CONFLICT (content): Merge conflict in gpkit/constraints/sgp.py
Auto-merging gpkit/constraints/prog_factories.py
Auto-merging 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 <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
 &gt; git init /jenkins/workspace/CE_gpkit_PR_dependencies # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
 &gt; git --version # timeout=10
 &gt; git --version # 'git version 2.25.1'
using GIT_SSH to set credentials 
 &gt; git fetch --tags --force --progress -- <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> +refs/heads/*:refs/remotes/origin/* # timeout=10
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> # timeout=10
 &gt; git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
using GIT_SSH to set credentials 
 &gt; git fetch --tags --force --progress -- <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 &gt; git rev-parse 49079432d011f7605035e10f02e2307c0542bedc^{commit} # timeout=10
Merging Revision 49079432d011f7605035e10f02e2307c0542bedc (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 &gt; git rev-parse origin/master^{commit} # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f origin/master # timeout=3
 &gt; git remote # timeout=10
 &gt; git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials 
 &gt; git merge --ff 49079432d011f7605035e10f02e2307c0542bedc # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f 49079432d011f7605035e10f02e2307c0542bedc # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 49079432d011f7605035e10f02e2307c0542bedc" returned status code 1:
stdout: Auto-merging gpkit/tests/t_examples.py
Auto-merging gpkit/solution_array.py
Auto-merging gpkit/constraints/sgp.py
CONFLICT (content): Merge conflict in gpkit/constraints/sgp.py
Auto-merging gpkit/constraints/prog_factories.py
Auto-merging 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 <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
 &gt; git init /jenkins/workspace/CE_gpkit_PR_dependencies # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
 &gt; git --version # timeout=10
 &gt; git --version # 'git version 2.25.1'
using GIT_SSH to set credentials 
 &gt; git fetch --tags --force --progress -- <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> +refs/heads/*:refs/remotes/origin/* # timeout=10
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> # timeout=10
 &gt; git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a>
using GIT_SSH to set credentials 
 &gt; git fetch --tags --force --progress -- <a href='https://github.com/convexengineering/gpkit'>https://github.com/convexengineering/gpkit</a> +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master # timeout=10
 &gt; git rev-parse 49079432d011f7605035e10f02e2307c0542bedc^{commit} # timeout=10
Merging Revision 49079432d011f7605035e10f02e2307c0542bedc (detached) to origin/master, UserMergeOptions{mergeRemote='origin', mergeTarget='master', mergeStrategy='DEFAULT', fastForwardMode='FF'}
 &gt; git rev-parse origin/master^{commit} # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f origin/master # timeout=3
 &gt; git remote # timeout=10
 &gt; git config --get remote.origin.url # timeout=10
using GIT_SSH to set credentials 
 &gt; git merge --ff 49079432d011f7605035e10f02e2307c0542bedc # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f 49079432d011f7605035e10f02e2307c0542bedc # timeout=3
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff 49079432d011f7605035e10f02e2307c0542bedc" returned status code 1:
stdout: Auto-merging gpkit/tests/t_examples.py
Auto-merging gpkit/solution_array.py
Auto-merging gpkit/constraints/sgp.py
CONFLICT (content): Merge conflict in gpkit/constraints/sgp.py
Auto-merging gpkit/constraints/prog_factories.py
Auto-merging gpkit/constraints/gp.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Setting status of 49079432d011f7605035e10f02e2307c0542bedc to FAILURE with url <a href='https://acdl.mit.edu/csi/job/CE_gpkit_PR_dependencies/2369/'>https://acdl.mit.edu/csi/job/CE_gpkit_PR_dependencies/2369/</a> and message: 'Shucks... didn't pass the tests...
 '
Using context: gpkit dependency tests
Finished: FAILURE