{"id":2172,"date":"2015-05-12T05:00:32","date_gmt":"2015-05-12T05:00:32","guid":{"rendered":"http:\/\/truelogic.org\/wordpress\/?p=2172"},"modified":"2015-05-12T05:00:32","modified_gmt":"2015-05-12T05:00:32","slug":"resolving-git-conflicts-using-theirs-or-ours","status":"publish","type":"post","link":"https:\/\/truelogic.org\/wordpress\/2015\/05\/12\/resolving-git-conflicts-using-theirs-or-ours\/","title":{"rendered":"Resolving git conflicts using ‘theirs’ or ‘ours’"},"content":{"rendered":"

If you want to overwrite your local copy of the conflicted file use the following commands:<\/p>\n

git checkout –theirs path\/to\/the\/conflicted_file.php<\/em>
\ngit add path\/to\/the\/conflicted_file.php<\/em><\/p>\n

 <\/p>\n

If you want to overwrite the version in the repository with your version then<\/p>\n

git checkout –ours path\/to\/the\/conflicted_file.php<\/em>
\ngit add path\/to\/the\/conflicted_file.php<\/em><\/p>\n

 <\/p>\n

Do a commit after making the changes above.<\/p>\n

 <\/p>\n","protected":false},"excerpt":{"rendered":"

If you want to overwrite your local copy of the conflicted file use the following commands: git checkout –theirs path\/to\/the\/conflicted_file.php git add path\/to\/the\/conflicted_file.php   If […]<\/a><\/p>\n<\/div>","protected":false},"author":1,"featured_media":2174,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[10,11],"tags":[],"class_list":["post-2172","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","category-programming","category-tutorials"],"_links":{"self":[{"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/posts\/2172","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/comments?post=2172"}],"version-history":[{"count":1,"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/posts\/2172\/revisions"}],"predecessor-version":[{"id":2173,"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/posts\/2172\/revisions\/2173"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/media\/2174"}],"wp:attachment":[{"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/media?parent=2172"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/categories?post=2172"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/truelogic.org\/wordpress\/wp-json\/wp\/v2\/tags?post=2172"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}