{"id":5662,"date":"2017-02-10T15:28:50","date_gmt":"2017-02-10T07:28:50","guid":{"rendered":"https:\/\/sdeno.com\/?p=5662"},"modified":"2017-02-10T15:30:13","modified_gmt":"2017-02-10T07:30:13","slug":"%e8%a7%a3%e5%86%b3%ef%bc%9asvn-e155015-remains-in-conflict","status":"publish","type":"post","link":"https:\/\/sdeno.com\/?p=5662","title":{"rendered":"\u89e3\u51b3\uff1asvn: E155015  remains in conflict"},"content":{"rendered":"<p>\u63d0\u793a\u5c31\u662f\u6587\u4ef6\u6709\u51b2\u7a81\uff0c\u95ee\u9898\u662f\u522b\u4eba\u4fee\u6539\u540e\u63d0\u4ea4\u4e86\u9875\u9762\u4f60\u5728\u4fee\u6539\u540e\u4e5f\u63d0\u4ea4\u4e86\u9875\u9762\u5bfc\u81f4\u5185\u5bb9\u4e0d\u4e00\u6837\uff0c\u53ef\u4ee5\u628a\u4f60\u548c\u4ed6\u7684\u5185\u5bb9\u90fd\u5408\u5e76\u4e4b\u540e\u5728\u63d0\u4ea4\u4e00\u6b21\u4f60\u66f4\u65b0\u7684\u4ee3\u7801\u5c31\u884c\u3002<\/p>\n<p>\u8fd9\u91cc\u6211\u7684\u89e3\u51b3\u529e\u6cd5\u662f\uff1a<\/p>\n<p>1\uff0c\u5148\u5907\u4efd\u4f60\u5f53\u524d\u7684\u4fee\u6539\u4ee3\u7801<\/p>\n<p>2\uff0c\u6e05\u7a7a\u672c\u5730\u8981\u63d0\u4ea4\u4ee3\u7801\u7684svn\u76ee\u5f55<\/p>\n<p>3\uff0c\u518d\u6b21\u5728\u6e05\u7a7a\u7684svn\u76ee\u5f55\u4e0bcheck out\u4e00\u6b21\uff0c\u4e5f\u5c31\u662f\u4e0b\u8f7d\u522b\u4eba\u4fee\u6539\u540e\u7684\u4ee3\u7801\uff0c\u4f60\u5728\u628a\u81ea\u5df1\u7684\u4ee3\u7801\u91cd\u65b0\u5199\u8fdb\u53bb\u5c31\u884c<\/p>\n<p>4\uff0c\u4e4b\u540e\u5c31\u53ef\u4ee5\u63d0\u4ea4\u81ea\u5df1\u4fee\u6539\u7684\u4ee3\u7801\u4e86<\/p>\n<pre class=\"p1\"><span class=\"s1\">svn commit -m \"\u4fee\u6539\u9875\u9762\"<\/span><\/pre>\n<p>\uff08\u8fd9\u91cc\u8fd8\u662f\u63a8\u8350\u4f7f\u7528\u5408\u5e76\u7684\u65b9\u5f0f\u6bd4\u8f83\u9760\u8c31\uff0c\u4e0d\u7136\u4f1a\u7d2f\u6b7b\u81ea\u5df1\uff09<\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u63d0\u793a\u5c31\u662f\u6587\u4ef6\u6709\u51b2\u7a81\uff0c\u95ee\u9898\u662f\u522b\u4eba\u4fee\u6539\u540e\u63d0\u4ea4\u4e86\u9875\u9762\u4f60\u5728\u4fee\u6539\u540e\u4e5f\u63d0\u4ea4\u4e86\u9875\u9762\u5bfc\u81f4\u5185\u5bb9\u4e0d\u4e00\u6837\uff0c\u53ef\u4ee5\u628a\u4f60\u548c\u4ed6\u7684\u5185\u5bb9\u90fd\u5408\u5e76\u4e4b [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[42],"tags":[],"class_list":["post-5662","post","type-post","status-publish","format-standard","hentry","category-mac"],"_links":{"self":[{"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/posts\/5662","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/sdeno.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=5662"}],"version-history":[{"count":0,"href":"https:\/\/sdeno.com\/index.php?rest_route=\/wp\/v2\/posts\/5662\/revisions"}],"wp:attachment":[{"href":"https:\/\/sdeno.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5662"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/sdeno.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=5662"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/sdeno.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=5662"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}