{"id":188594,"date":"2020-11-10T13:34:42","date_gmt":"2020-11-10T05:34:42","guid":{"rendered":"http:\/\/4563.org\/?p=188594"},"modified":"2020-11-10T13:34:42","modified_gmt":"2020-11-10T05:34:42","slug":"%e5%9c%a8-vscode-remote-development-%e6%97%b6%ef%bc%8c%e5%a6%82%e4%bd%95-git-diff-git-merge-%e5%91%a2%ef%bc%9f","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=188594","title":{"rendered":"\u5728 vscode remote development \u65f6\uff0c\u5982\u4f55 git diff &amp;&amp; git merge \u5462\uff1f"},"content":{"rendered":"<div>\n<div>\n<div>\n<h1>                  \u5728 vscode remote development \u65f6\uff0c\u5982\u4f55 git diff &amp;&amp; git merge \u5462\uff1f               <\/h1>\n<p> <\/p>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : yazoox <\/span>  <span><i><\/i> 6<\/span> <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n<div isfirst=\"1\"> <\/p>\n<p>\u6700\u8fd1\u8bd5\u4e86\u4e00\u4e0b vscode remote development\uff0c\u642d\u8d77\u6765\u4e86\uff0c\u5f88\u597d\u7528\u3002<br \/> \u8fdc\u7a0b\u7684\u673a\u5668\uff0c\u6bd4\u81ea\u5df1\u7684\u673a\u5668\u5f3a\u5927\u3002<\/p>\n<p>remote host \u662f\u53f0 linux \u7684\u673a\u5668,ubuntu 20 \u7684\u7248\u672c<br \/> local \u7684\u662f mbp \u6216\u8005 windows 10 \u7684\u673a\u5668\u3002<\/p>\n<p>\u7528 vscode \u8fde\u63a5\u8fdc\u7a0b\u540e\uff0c\u5199\u4ee3\u7801\u6ca1\u6709\u95ee\u9898\u3002\u53ef\u662f\u4ee3\u7801\u5199\u5b8c\u4e86\uff0c\u9700\u8981 git diff \u6216\u8005 git merge \uff08 git rebase master)\u7684\u65f6\u5019\uff0c\u5c31\u9ebb\u70e6\u4e86\u3002<\/p>\n<p>\u4ee5\u524d\u672c\u5730\u5f00\u53d1\u7684\u65f6\u5019\uff0c\u7528\u7684\u662f Kdiff3 \u6216\u8005 beyond compare\uff0c\u5f88\u65b9\u4fbf\u7684\u3002\u4f46\u73b0\u5728\u673a\u5668\u5728\u8fdc\u7a0b\u7684 linux \u4e0a\u9762\uff0c\u6ca1\u6709\u56fe\u5f62\u754c\u9762\uff0c\u53ea\u6709 terminal \u4e0a\u53bb\u7ec8\u7aef\u754c\u9762\u3002<\/p>\n<p>thx.<\/p>\n<\/p><\/div>\n<div> <b>\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (<span>4<\/span>)        <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<ul>\n<li data-pid=\"4024423\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : elfive <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u8bd5\u8bd5 gitlens \u8fd9\u4e2a\u63d2\u4ef6                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"4024424\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : yinlibo <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             terminal \u4e60\u60ef\u4e86\u4e5f\u633a\u65b9\u4fbf\u554a                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"4024425\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : lovepocky <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u81ea\u5e26\u7684 diff \u52a0\u4e0a gitlens\uff0c\u5f88\u5f3a\u5927\u4e86                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"4024426\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : lbyo <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             Git Graph \u4e5f\u53ef\u4ee5\u88c5\u4e00\u4e2a\u8bd5\u8bd5\u770b                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li>\n","protected":false},"excerpt":{"rendered":"<p>\u5728 vscode remote d&hellip;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/188594"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=188594"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/188594\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=188594"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=188594"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=188594"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}