{"id":126,"date":"2013-06-12T17:00:00","date_gmt":"2013-06-13T07:00:00","guid":{"rendered":"http:\/\/ploscariu.com\/wordpress\/?p=126"},"modified":"2014-10-31T15:08:54","modified_gmt":"2014-10-31T15:08:54","slug":"egit-merge","status":"publish","type":"post","link":"http:\/\/ploscariu.com\/wordpress\/2013\/06\/12\/egit-merge\/","title":{"rendered":"Egit merge"},"content":{"rendered":"<p>\n\tToday I made my first git merge, using EGit(an Eclipse plugin), I had to read a lot of documentation about egit, fix some conflicts and finaly commit the fixes. In the end all worked ok,not great &nbsp;I am not sure I like how the conflict resolving works.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Today I made my first git merge, using EGit(an Eclipse plugin), I had to read a lot of documentation about egit, fix some conflicts and finaly commit the fixes. In the end all worked ok,not great &nbsp;I am not sure I like how the conflict resolving works.<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[2],"tags":[13,16],"class_list":["post-126","post","type-post","status-publish","format-standard","hentry","category-programming","tag-egit","tag-git"],"kl_preview_url":"http:\/\/ploscariu.com\/wordpress\/?p=126&preview=1&kc_p=f23a44db64","_links":{"self":[{"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/posts\/126","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/comments?post=126"}],"version-history":[{"count":1,"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/posts\/126\/revisions"}],"predecessor-version":[{"id":676,"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/posts\/126\/revisions\/676"}],"wp:attachment":[{"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/media?parent=126"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/categories?post=126"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/ploscariu.com\/wordpress\/wp-json\/wp\/v2\/tags?post=126"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}