RazorEnhanced Wiki

User Tools

Site Tools

Trace:
wiki:welcome

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Next revision		Previous revision
wiki:welcome [2022/09/03 17:15] – created - external edit 127.0.0.1wiki:welcome [2025/02/25 22:20] (current) – external edit 127.0.0.1
Line 26: Line 26:
 DokuWiki is an Open Source project that thrives through user contributions. A good way to stay informed on what's going on and to get useful tips in using DokuWiki is subscribing to the [[doku>newsletter]]. DokuWiki is an Open Source project that thrives through user contributions. A good way to stay informed on what's going on and to get useful tips in using DokuWiki is subscribing to the [[doku>newsletter]].
  
-The [[https://forum.dokuwiki.org|DokuWiki User Forum]] is an excellent way to get in contact with other DokuWiki users and is just one of the many ways to get [[doku>faq:support|support]].+The [[http://forum.dokuwiki.org|DokuWiki User Forum]] is an excellent way to get in contact with other DokuWiki users and is just one of the many ways to get [[doku>faq:support|support]].
  
 Of course we'd be more than happy to have you [[doku>teams:getting_involved|getting involved]] with DokuWiki. Of course we'd be more than happy to have you [[doku>teams:getting_involved|getting involved]] with DokuWiki.
  
wiki/welcome.1662225322.txt.gz · Last modified: 2022/09/03 17:15 by 127.0.0.1
Exception: Git command failed to perform periodic pull: hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before 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. Warning: Permanently added 'github.com,140.82.113.3' (ECDSA) to the list of known hosts. From github.com:RazorEnhanced/razorenhanced.github.io * branch main -> FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: doc/api/CUO.html doc/api/Gumps.html doc/api/Item.html doc/api/Items.html doc/api/Journal.html doc/api/Misc.html doc/api/Mobile.html doc/api/PacketLogger.html doc/api/PathFinding.html doc/api/Player.html doc/api/Spells.html doc/api/Target.html doc/api/Trade.html doc/api/Vendor.html Please commit your changes or stash them before you merge. Aborting

Exception: Git command failed to perform periodic pull: hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before 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. Warning: Permanently added 'github.com,140.82.113.3' (ECDSA) to the list of known hosts. From github.com:RazorEnhanced/razorenhanced.github.io * branch main -> FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: doc/api/CUO.html doc/api/Gumps.html doc/api/Item.html doc/api/Items.html doc/api/Journal.html doc/api/Misc.html doc/api/Mobile.html doc/api/PacketLogger.html doc/api/PathFinding.html doc/api/Player.html doc/api/Spells.html doc/api/Target.html doc/api/Trade.html doc/api/Vendor.html Please commit your changes or stash them before you merge. Aborting

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.