{"id":3228,"date":"2014-06-23T19:49:31","date_gmt":"2014-06-23T19:49:31","guid":{"rendered":"http:\/\/webninjataylor.com\/library\/?p=3228"},"modified":"2014-06-24T20:50:06","modified_gmt":"2014-06-24T20:50:06","slug":"git-resolve-merge-conflict-using-other-branchs-version","status":"publish","type":"post","link":"https:\/\/webninjataylor.com\/library\/git-resolve-merge-conflict-using-other-branchs-version\/","title":{"rendered":"Git: Resolve Merge Conflict Using Other Branch&#8217;s Version"},"content":{"rendered":"<pre>git checkout theirs [file]<\/pre>\n","protected":false},"excerpt":{"rendered":"<p>git checkout theirs [file]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[144],"tags":[2,22],"class_list":["post-3228","post","type-post","status-publish","format-standard","hentry","category-web-shots","tag-git","tag-terminal"],"_links":{"self":[{"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/posts\/3228","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/comments?post=3228"}],"version-history":[{"count":3,"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/posts\/3228\/revisions"}],"predecessor-version":[{"id":3322,"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/posts\/3228\/revisions\/3322"}],"wp:attachment":[{"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/media?parent=3228"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/categories?post=3228"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/webninjataylor.com\/library\/wp-json\/wp\/v2\/tags?post=3228"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}