GitHub pull request #127 of commit f4aab0bea2fcbb14f83799cd4625a1101ea6866a, has merge conflicts.
Setting status of f4aab0bea2fcbb14f83799cd4625a1101ea6866a to PENDING with url <a href='https://acdl.mit.edu/csi/job/gpkit_commons_PR_Models/23/'>https://acdl.mit.edu/csi/job/gpkit_commons_PR_Models/23/</a> and message: 'Running tests... hold your breath...'
Using context: gpkit model tests
Building remotely on <a href='/csi/computer/reynolds' class='jenkins-table__link model-link model-link--float'>reynolds</a> in workspace /jenkins/workspace/gpkit_commons_PR_Models
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git init /jenkins/workspace/gpkit_commons_PR_Models # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git --version # timeout=10
 &gt; git fetch --tags --progress <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a> +refs/heads/*:refs/remotes/origin/*
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</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/gplibrary'>https://github.com/convexengineering/gplibrary</a> # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git fetch --tags --progress <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a> +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
 &gt; git rev-parse f4aab0bea2fcbb14f83799cd4625a1101ea6866a^{commit} # timeout=10
Merging Revision f4aab0bea2fcbb14f83799cd4625a1101ea6866a (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 merge --ff f4aab0bea2fcbb14f83799cd4625a1101ea6866a # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f f4aab0bea2fcbb14f83799cd4625a1101ea6866a # timeout=3
Was not possible to get build data
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff f4aab0bea2fcbb14f83799cd4625a1101ea6866a" returned status code 1:
stdout: Auto-merging gpkitmodels/GP/aircraft/wing/wing.py
CONFLICT (content): Merge conflict in gpkitmodels/GP/aircraft/wing/wing.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 <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git init /jenkins/workspace/gpkit_commons_PR_Models # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git --version # timeout=10
 &gt; git fetch --tags --progress <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a> +refs/heads/*:refs/remotes/origin/*
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</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/gplibrary'>https://github.com/convexengineering/gplibrary</a> # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git fetch --tags --progress <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a> +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
 &gt; git rev-parse f4aab0bea2fcbb14f83799cd4625a1101ea6866a^{commit} # timeout=10
Merging Revision f4aab0bea2fcbb14f83799cd4625a1101ea6866a (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 merge --ff f4aab0bea2fcbb14f83799cd4625a1101ea6866a # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f f4aab0bea2fcbb14f83799cd4625a1101ea6866a # timeout=3
Was not possible to get build data
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff f4aab0bea2fcbb14f83799cd4625a1101ea6866a" returned status code 1:
stdout: Auto-merging gpkitmodels/GP/aircraft/wing/wing.py
CONFLICT (content): Merge conflict in gpkitmodels/GP/aircraft/wing/wing.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 <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git init /jenkins/workspace/gpkit_commons_PR_Models # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git --version # timeout=10
 &gt; git fetch --tags --progress <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a> +refs/heads/*:refs/remotes/origin/*
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</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/gplibrary'>https://github.com/convexengineering/gplibrary</a> # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git fetch --tags --progress <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a> +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
 &gt; git rev-parse f4aab0bea2fcbb14f83799cd4625a1101ea6866a^{commit} # timeout=10
Merging Revision f4aab0bea2fcbb14f83799cd4625a1101ea6866a (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 merge --ff f4aab0bea2fcbb14f83799cd4625a1101ea6866a # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f f4aab0bea2fcbb14f83799cd4625a1101ea6866a # timeout=3
Was not possible to get build data
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff f4aab0bea2fcbb14f83799cd4625a1101ea6866a" returned status code 1:
stdout: Auto-merging gpkitmodels/GP/aircraft/wing/wing.py
CONFLICT (content): Merge conflict in gpkitmodels/GP/aircraft/wing/wing.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 <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git init /jenkins/workspace/gpkit_commons_PR_Models # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git --version # timeout=10
 &gt; git fetch --tags --progress <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a> +refs/heads/*:refs/remotes/origin/*
 &gt; git config remote.origin.url <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</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/gplibrary'>https://github.com/convexengineering/gplibrary</a> # timeout=10
Fetching upstream changes from <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a>
 &gt; git fetch --tags --progress <a href='https://github.com/convexengineering/gplibrary'>https://github.com/convexengineering/gplibrary</a> +refs/pull/*:refs/remotes/origin/pr/* +refs/heads/master:refs/remotes/origin/master
 &gt; git rev-parse f4aab0bea2fcbb14f83799cd4625a1101ea6866a^{commit} # timeout=10
Merging Revision f4aab0bea2fcbb14f83799cd4625a1101ea6866a (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 merge --ff f4aab0bea2fcbb14f83799cd4625a1101ea6866a # timeout=10
 &gt; git config core.sparsecheckout # timeout=10
 &gt; git checkout -f f4aab0bea2fcbb14f83799cd4625a1101ea6866a # timeout=3
Was not possible to get build data
ERROR: Branch not suitable for integration as it does not merge cleanly: Command "git merge --ff f4aab0bea2fcbb14f83799cd4625a1101ea6866a" returned status code 1:
stdout: Auto-merging gpkitmodels/GP/aircraft/wing/wing.py
CONFLICT (content): Merge conflict in gpkitmodels/GP/aircraft/wing/wing.py
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Setting status of f4aab0bea2fcbb14f83799cd4625a1101ea6866a to FAILURE with url <a href='https://acdl.mit.edu/csi/job/gpkit_commons_PR_Models/23/'>https://acdl.mit.edu/csi/job/gpkit_commons_PR_Models/23/</a> and message: 'Shucks... didn't pass the tests...
 '
Using context: gpkit model tests
Finished: FAILURE