User Tools

Site Tools


You are not allowed to view this page.
start

Permission Denied

Sorry, you don't have enough rights to continue.

Login

You are currently not logged in! Enter your authentication credentials below to log in. You need to have cookies enabled to log in.

Log In

Forgotten your password? Get a new one: Set new password


Exception: Git command failed to perform periodic pull: From git.ph1.uni-koeln.de:great/sofia-galaxy-survey-wiki * branch master -> FETCH_HEAD 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.

Exception: Git command failed to perform periodic pull: From git.ph1.uni-koeln.de:great/sofia-galaxy-survey-wiki * branch master -> FETCH_HEAD 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.

An unforeseen error has occured. This is most likely a bug somewhere. It might be a problem in the gitbacked plugin.

More info has been written to the DokuWiki error log.