Started by timer Running as SYSTEM Building in workspace /var/local/jenkins/workspace/autoplot-all [autoplot-all] $ /bin/sh -xe /tmp/jenkins14025436274947910321.sh + pwd + echo PWD: , /var/local/jenkins/workspace/autoplot-all PWD: , /var/local/jenkins/workspace/autoplot-all + echo TAG: TAG: + [ -d autoplot ] + cd autoplot + git pull From https://github.com/autoplot/autoplot fd152f0b2..2d05546e1 main -> origin/main Updating fd152f0b2..2d05546e1 Fast-forward Autoplot/compile-application.sh | 1 + 1 file changed, 1 insertion(+) + cd .. + pwd + echo PWD1: , /var/local/jenkins/workspace/autoplot-all PWD1: , /var/local/jenkins/workspace/autoplot-all + cd autoplot + [ -d das2java/dasCore ] + cd das2java + git pull 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 Finished: FAILURE