byggsteg-4faf8fd9-ea71

job failed

starting new job...


→ running command: cd "/etc/byggsteg/job-clone//byggsteg/trunk" && git reset --hard && git pull

HEAD is now at 1567b5e README.org bijwerken
From https://github.com/jjba23/byggsteg
 + 1567b5e...61d8b18 trunk      -> origin/trunk  (forced update)
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
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.
inspect the job's lambda expression
(lambda()
  `((task . ("maak-test" "byggsteg-version" "maak-deploy"))
    (daemon-name . "byggsteg-daemon")
    (project . "byggsteg")
    (branch-name . "trunk")
    (clone-url . "https://github.com/jjba23/byggsteg.git")))