{"id":2082,"date":"2022-08-17T15:31:27","date_gmt":"2022-08-17T07:31:27","guid":{"rendered":"https:\/\/www.caiqinyi.cn\/?p=2082"},"modified":"2022-08-17T15:31:59","modified_gmt":"2022-08-17T07:31:59","slug":"upgrading_code_git_diff_files","status":"publish","type":"post","link":"https:\/\/www.caiqinyi.cn\/index.php\/2022\/08\/17\/upgrading_code_git_diff_files\/","title":{"rendered":"\u4f7f\u7528Git Diff\u6587\u4ef6\u5347\u7ea7\u4ee3\u7801"},"content":{"rendered":"

\u8fd9\u4e24\u5929\u5728\u5347\u7ea7HoudiniEngine\u63d2\u4ef6\u7684\u4ee3\u7801, \u5728\u89e3\u51b3\u5b8c\u7f16\u8bd1\u95ee\u9898\u4ee5\u540e\u5f00\u59cb\u624b\u52a8Merge\u4e4b\u524d\u7684\u6539\u52a8, \u672c\u6587\u4e3b\u8981\u8bb0\u5f55\u4e00\u4e0b\u4f7f\u7528Diff\u6587\u4ef6\u5347\u7ea7\u4ee3\u7801\u7684\u6d41\u7a0b.<\/p>\n

<\/p>\n

\u7531\u4e8e\u9700\u8981\u548c\u540c\u4e8b\u4e00\u8d77\u5347\u7ea7HoudiniEngine\u63d2\u4ef6, \u6240\u4ee5\u4e13\u95e8\u4e3a\u65b0\u7684HoudiniEngine\u63d2\u4ef6\u5efa\u7acb\u4e86\u4e00\u4e2aGitLab\u4ed3\u5e93. \u5728\u8fd9\u79cd\u60c5\u51b5\u4e0b, \u6211\u9009\u62e9\u4f7f\u7528Diff\u6587\u4ef6\u6765\u4f5c\u4e3a\u8de8\u4ed3\u5e93\u5347\u7ea7\u4ee3\u7801\u7684\u5a92\u4ecb.<\/p>\n

1. \u521b\u5efaDiff\u6587\u4ef6<\/strong><\/p>\n

\u53ef\u4ee5\u4f7f\u7528SourceTree\u8df3\u8f6c\u5230\u6307\u5b9a\u63d0\u4ea4\u4ee5\u540e, \u5728\u53f3\u952e\u83dc\u5355\u4e2d\u9009\u62e9”\u521b\u5efa\u8865\u4e01” \u5373\u53ef\u521b\u5efa\u76f8\u5e94\u7684Diff\u6587\u4ef6.<\/p>\n

2. \u4fee\u6539Diff\u6587\u4ef6<\/strong><\/p>\n

\u7531\u4e8e\u4e24\u4e2a\u4ed3\u5e93\u4e2d\u5bf9\u5e94\u7684\u6e90\u4ee3\u7801\u6587\u4ef6\u8def\u5f84\u4e00\u822c\u662f\u4e0d\u4e00\u81f4\u7684, \u6240\u4ee5\u5728\u521b\u5efa\u5b8cDiff\u6587\u4ef6\u4ee5\u540e, \u8fd8\u9700\u8981\u6253\u5f00Diff\u6587\u4ef6\u8fdb\u884c\u7f16\u8f91, \u5c06\u5176\u4e2d\u7684\u6e90\u4ee3\u7801\u6587\u4ef6\u8def\u5f84\u4fee\u6539\u4e3a\u65b0\u4ed3\u5e93\u4e2d\u7684\u6587\u4ef6\u8def\u5f84. \u4e00\u822c\u6765\u8bf4, Diff\u6587\u4ef6\u4e2d”a\/” \u4e0e”b\/” \u4ee5\u540e\u7684\u6e90\u4ee3\u7801\u6587\u4ef6\u8def\u5f84\u5747\u9700\u8981\u4fee\u6539.<\/p>\n

3. \u5e94\u7528Diff\u6587\u4ef6<\/strong><\/p>\n

\u4f7f\u7528\u5982\u4e0b\u547d\u4ee4\u5e94\u7528Diff\u6587\u4ef6.<\/p>\n

\r\ngit apply --reject XXX.diff\r\n<\/pre>\n
\u5176\u4e2d, \u53c2\u6570”–reject” \u8868\u793a\u5f53\u5e94\u7528Diff\u6587\u4ef6\u5931\u8d25\u65f6, \u9700\u8981\u5728\u76f8\u5e94\u7684\u6e90\u4ee3\u7801\u6587\u4ef6\u7684\u540c\u7ea7\u76ee\u5f55\u4e0b\u751f\u6210reject\u6587\u4ef6. \u6839\u636ereject\u6587\u4ef6, \u6211\u4eec\u53ef\u4ee5\u6e05\u695a\u5730\u77e5\u9053\u6709\u54ea\u4e9b\u4ee3\u7801\u5757\u7684\u6539\u52a8\u65e0\u6cd5\u88ab\u76f4\u63a5\u5e94\u7528. \u6b64\u65f6, \u6211\u4eec\u9700\u8981\u6253\u5f00\u76f8\u5e94\u7684\u6e90\u4ee3\u7801\u6587\u4ef6\u624b\u52a8\u89e3\u51b3\u95ee\u9898.<\/p>\n","protected":false},"excerpt":{"rendered":"
\u8fd9\u4e24\u5929\u5728\u5347\u7ea7HoudiniEngine\u63d2\u4ef6\u7684\u4ee3\u7801, \u5728\u89e3\u51b3\u5b8c\u7f16\u8bd1\u95ee\u9898\u4ee5\u540e\u5f00\u59cb\u624b\u52a8Merge\u4e4b\u524d\u7684\u6539\u52a8, \u672c\u6587\u4e3b … \u7ee7\u7eed\u9605\u8bfb\u4f7f\u7528Git Diff\u6587\u4ef6\u5347\u7ea7\u4ee3\u7801<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[11],"tags":[],"_links":{"self":[{"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts\/2082"}],"collection":[{"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/comments?post=2082"}],"version-history":[{"count":8,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts\/2082\/revisions"}],"predecessor-version":[{"id":2648,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/posts\/2082\/revisions\/2648"}],"wp:attachment":[{"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/media?parent=2082"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/categories?post=2082"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.caiqinyi.cn\/index.php\/wp-json\/wp\/v2\/tags?post=2082"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}