{"absolute_url": "/jbmckee/git-merge-conflicts/", "blog_post": false, "code": "grep -lr '<<<<<<<' . | xargs git checkout --theirs", "created": "2016-12-20T20:59:29.238109", "description": "", "description_rendered": "", "embed_url": "https://snipt.net/embed/cca86c8c58527986414eefaa4ff6859e/", "full_absolute_url": "/jbmckee/git-merge-conflicts/", "id": 1, "lexer": "text", "line_count": 1, "log_entries": [{"code": "grep -lr '<<<<<<<' . | xargs git checkout --theirs", "created": "2016-12-20T20:59:32.678278", "diff": "--- \n+++ \n@@ -0,0 +1 @@\n+grep -lr '<<<<<<<' . | xargs git checkout --theirs", "user": "jbmckee"}], "meta": "", "modified": "2026-04-23T03:44:45.383959", "publish_date": "2016-12-20T20:59:29.139016", "raw_url": "/raw/cca86c8c58527986414eefaa4ff6859e/", "resource_uri": "/api/public/snipt/1/", "slug": "git-merge-conflicts", "stylized": "<table class=\"highlighttable\"><tr><td class=\"linenos\"><div class=\"linenodiv\"><pre><a href=\"#L-1\">1</a></pre></div></td><td class=\"code\"><div class=\"highlight\"><pre><span></span><span id=\"L-1\"><a name=\"L-1\"></a>grep -lr &#39;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&#39; . | xargs git checkout --theirs\n</span></pre></div>\n</td></tr></table>", "tags": [{"absolute_url": "/public/tag/git/", "id": 17, "name": "git", "resource_uri": "/api/public/tag/17/", "snipts": "/api/public/snipt/?tag=17"}], "title": "git merge conflicts", "user": {"absolute_url": "/jbmckee/", "email_md5": "f4da96308b6db1b0b19738a7c105d3da", "id": 1, "resource_uri": "/api/public/user/1/", "snipts": "/api/public/snipt/?user=1", "snipts_count": 72, "username": "jbmckee"}}