{"id":605,"date":"2023-10-23T17:57:13","date_gmt":"2023-10-23T09:57:13","guid":{"rendered":"https:\/\/blogs.woria.cn\/?p=605"},"modified":"2023-10-23T17:57:13","modified_gmt":"2023-10-23T09:57:13","slug":"svn%e8%a7%a3%e5%86%b3%e5%86%b2%e7%aa%81postpone-accept-base-accept-incoming-reject-incoming-accept-incoming-for-conflictsu%e5%8c%ba%e5%88%ab","status":"publish","type":"post","link":"https:\/\/blogs.woria.cn\/?p=605","title":{"rendered":"svn\u89e3\u51b3\u51b2\u7a81Postpone , Accept base, Accept incoming, Reject incoming, Accept incoming for conflictsu\u533a\u522b"},"content":{"rendered":"\n<p>Postpone\uff08\u63a8\u8fdf\uff09\uff1a\u6682\u65f6\u4e0d\u5904\u7406\u51b2\u7a81\uff0c\u5148\u5c06\u5176\u6807\u8bb0\u4e3a\u672a\u89e3\u51b3\u72b6\u6001\uff0c\u4ee5\u4fbf\u65e5\u540e\u518d\u6b21\u8fdb\u884c\u5904\u7406\u3002<\/p>\n\n\n\n<p>Accept base\uff08\u63a5\u53d7\u57fa\u7840\u7248\u672c\uff09\uff1a\u4f7f\u7528\u670d\u52a1\u5668\u4e0a\u7684\u57fa\u7840\u7248\u672c\uff0c\u653e\u5f03\u672c\u5730\u4fee\u6539\uff0c\u5c06\u5176\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3\u72b6\u6001\u3002<\/p>\n\n\n\n<p>Accept incoming\uff08\u63a5\u53d7\u670d\u52a1\u5668\u7248\u672c\uff09\uff1a\u4f7f\u7528\u670d\u52a1\u5668\u4e0a\u7684\u7248\u672c\uff0c\u653e\u5f03\u672c\u5730\u4fee\u6539\uff0c\u5c06\u5176\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3\u72b6\u6001\u3002<\/p>\n\n\n\n<p>Reject incoming\uff08\u62d2\u7edd\u670d\u52a1\u5668\u7248\u672c\uff09\uff1a\u62d2\u7edd\u670d\u52a1\u5668\u4e0a\u7684\u7248\u672c\uff0c\u4fdd\u7559\u672c\u5730\u4fee\u6539\uff0c\u5c06\u5176\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3\u72b6\u6001\u3002<\/p>\n\n\n\n<p>Accept incoming for conflicts\uff08\u4e3a\u51b2\u7a81\u63a5\u53d7\u670d\u52a1\u5668\u7248\u672c\uff09\uff1a\u4f7f\u7528\u670d\u52a1\u5668\u4e0a\u7684\u7248\u672c\u89e3\u51b3\u51b2\u7a81\uff0c\u5c06\u5176\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3\u72b6\u6001\u3002<\/p>\n\n\n\n<p>Reject conflicts\uff08\u62d2\u7edd\u51b2\u7a81\uff09\uff1a\u62d2\u7edd\u89e3\u51b3\u51b2\u7a81\uff0c\u4fdd\u7559\u672c\u5730\u4fee\u6539\uff0c\u5c06\u5176\u6807\u8bb0\u4e3a\u5df2\u89e3\u51b3\u72b6\u6001\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"<p>Postpone\uff08\u63a8\u8fdf\uff09\uff1a\u6682\u65f6\u4e0d\u5904\u7406\u51b2\u7a81\uff0c\u5148\u5c06\u5176\u6807\u8bb0\u4e3a\u672a\u89e3\u51b3\u72b6\u6001\uff0c\u4ee5\u4fbf\u65e5\u540e\u518d\u6b21\u8fdb\u884c\u5904\u7406\u3002 Accept bas&#8230;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[2,9,5],"tags":[],"class_list":["post-605","post","type-post","status-publish","format-standard","hentry","category-technique","category-programmer","category-magician"],"_links":{"self":[{"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=\/wp\/v2\/posts\/605","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=605"}],"version-history":[{"count":1,"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=\/wp\/v2\/posts\/605\/revisions"}],"predecessor-version":[{"id":606,"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=\/wp\/v2\/posts\/605\/revisions\/606"}],"wp:attachment":[{"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=605"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=605"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/blogs.woria.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=605"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}