Console Output

+ git -C /home/pub/jenkins_BFB_test_configs/sys_admin pull
From https://github.com/larson-group/sys_admin
   6cd1452..5d70781  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	python_nightly_test_suite/tests/bit_diff_test.py
Please commit your changes or stash them before you merge.
Aborting
Updating 6cd1452..5d70781