{"id":16,"date":"2004-04-02T01:00:00","date_gmt":"2004-04-01T23:00:00","guid":{"rendered":"http:\/\/www.christian-loose.de\/wordpress\/?p=16"},"modified":"2013-10-15T14:01:43","modified_gmt":"2013-10-15T12:01:43","slug":"resolve-dialog-is-in","status":"publish","type":"post","link":"http:\/\/www.christian-loose.de\/wordpress\/2004\/04\/resolve-dialog-is-in\/","title":{"rendered":"resolve dialog is in&#8230;"},"content":{"rendered":"<p>I finally checked-in the new resolve dialog code. This should fix all known bugs like removed characters or added new lines. Another thing that should work now, is the case when a conflict marker and the content is on the same line. This never worked before. Yippee!<\/p>\n<p>Unfortunately it was too late to backport it to the KDE 3.2.2 branch, because there wasn&#8217;t enough time to test it. So it will be part of the KDE 3.2.3 release.<\/p>\n","protected":false},"excerpt":{"rendered":"<p>I finally checked-in the new resolve dialog code. This should fix all known bugs like removed characters or added new lines. Another thing that should work now, is the case when a conflict marker and the content is on the same line. This never worked before. Yippee! Unfortunately it was too late to backport it &hellip; <a href=\"http:\/\/www.christian-loose.de\/wordpress\/2004\/04\/resolve-dialog-is-in\/\" class=\"more-link\">Continue reading <span class=\"screen-reader-text\">resolve dialog is in&#8230;<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[6,3],"tags":[],"_links":{"self":[{"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/posts\/16"}],"collection":[{"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/comments?post=16"}],"version-history":[{"count":1,"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/posts\/16\/revisions"}],"predecessor-version":[{"id":26,"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/posts\/16\/revisions\/26"}],"wp:attachment":[{"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/media?parent=16"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/categories?post=16"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/www.christian-loose.de\/wordpress\/wp-json\/wp\/v2\/tags?post=16"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}