git store merge conflict solution

edit
Fork to remote system
raw

README.rst

Reference: https://git-scm.com/2010/03/08/rerere.html

Configuration:

$ git config --global rerere.enabled true
Add file
Delete paste
Christian Weiske Christian Weiske
owner

History

phorkie, the self-hosted, git-based pastebin software is available under the AGPL.