Started by user Jeremy Faden
Running as SYSTEM
Building in workspace /var/local/jenkins/workspace/autoplot-test100
[autoplot-test100] $ /bin/sh -xe /tmp/jenkins11942818549620846645.sh
+ hostname
+ whoami
+ echo running test on spot10 by tomcat
running test on spot10 by tomcat
+ pwd
+ echo /var/local/jenkins/workspace/autoplot-test100
/var/local/jenkins/workspace/autoplot-test100
+ [ -d autoplot ]
+ cd autoplot
+ git pull
From https://github.com/autoplot/autoplot
   7755ce114..fd152f0b2  main       -> origin/main
Updating 7755ce114..fd152f0b2
Fast-forward
 DataSourcePack/src/org/autoplot/ascii/AsciiTableTableModel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
+ cd ..
+ pwd
+ echo PWD1: , /var/local/jenkins/workspace/autoplot-test100
PWD1: , /var/local/jenkins/workspace/autoplot-test100
+ cd autoplot
+ [ -d das2java/dasCore ]
+ cd das2java
+ git pull
From https://github.com/das-developers/das2java
   268c5fbfb..125730426  main       -> origin/main
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.
Build step 'Execute shell' marked build as failure
Archiving artifacts
Finished: FAILURE