{"type":"rich","version":"1.0","provider_name":"phorkie","provider_url":"https:\/\/p.cweiske.de\/","title":"git store merge conflict solution","author_name":"Christian Weiske","cache_age":86400,"width":900,"height":900,"html":"<!-- embedding all files of https:\/\/p.cweiske.de\/378 -->\n<link rel=\"stylesheet\" href=\"https:\/\/p.cweiske.de\/css\/embed.css\"\/>\n<div class=\"phork\" id=\"378\">\n    <div class=\"phork-file\">\n <div class=\"phork-content\">\n  \n<div class=\"document\">\n\n\n<p>Reference: <a class=\"reference external\" href=\"https:\/\/git-scm.com\/2010\/03\/08\/rerere.html\">https:\/\/git-scm.com\/2010\/03\/08\/rerere.html<\/a><\/p>\n<p>Configuration:<\/p>\n<pre class=\"literal-block\">\n$ git config --global rerere.enabled true\n<\/pre>\n<\/div>\n\n <\/div>\n <div class=\"phork-meta\">\n  <a href=\"https:\/\/p.cweiske.de\/378\/rev-raw\/fcd00716711b3dce7625565ea1b2528f170081e4\/README.rst\" style=\"float: right\">view raw source<\/a>\n  <a href=\"https:\/\/p.cweiske.de\/378#README.rst\">README.rst<\/a>\n <\/div>\n<\/div>\n<\/div>\n"}