{"id":280116,"date":"2021-01-13T11:50:22","date_gmt":"2021-01-13T03:50:22","guid":{"rendered":"http:\/\/4563.org\/?p=280116"},"modified":"2021-01-13T11:50:22","modified_gmt":"2021-01-13T03:50:22","slug":"%e4%b9%a0%e6%83%af%e4%ba%86-android-studio-idea-%e9%87%8c%e7%9a%84-git-%e6%8f%92%e4%bb%b6%ef%bc%8c%e7%94%a8-source-tree-%e6%84%9f%e8%a7%89%e4%b8%8d%e9%80%82%e5%ba%94%ef%bc%8c%e7%89%b9%e5%88%ab","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=280116","title":{"rendered":"\u4e60\u60ef\u4e86 Android Studio (IDEA) \u91cc\u7684 git \u63d2\u4ef6\uff0c\u7528 Source Tree \u611f\u89c9\u4e0d\u9002\u5e94\uff0c\u7279\u522b\u662f\u5bf9\u6bd4\u529f\u80fd\uff0c\u6709\u6ca1\u6709\u529e\u6cd5\u72ec\u7acb\u7528\u8fd9\u4e2a\u63d2\u4ef6\uff0c\u6216\u8005\u6709\u7c7b\u4f3c\u7684\u8f6f\u4ef6\uff1f"},"content":{"rendered":"
\n
\n
\n

\u4e60\u60ef\u4e86 Android Studio (IDEA) \u91cc\u7684 git \u63d2\u4ef6\uff0c\u7528 Source Tree \u611f\u89c9\u4e0d\u9002\u5e94\uff0c\u7279\u522b\u662f\u5bf9\u6bd4\u529f\u80fd\uff0c\u6709\u6ca1\u6709\u529e\u6cd5\u72ec\u7acb\u7528\u8fd9\u4e2a\u63d2\u4ef6\uff0c\u6216\u8005\u6709\u7c7b\u4f3c\u7684\u8f6f\u4ef6\uff1f <\/h1>\n

<\/p>\n

\n
\u8cc7\u6df1\u5927\u4f6c : raiz <\/span> <\/i> 4<\/span> <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n
sublime merge <\/div>\n
\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (20<\/span>) <\/div>\n
<\/div>\n<\/p><\/div>\n<\/p><\/div>\n
    \n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : linxiaojialin <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    beyond compare \u914d\u5408 Fork \u7279\u522b\u597d\u7528 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : yjxjn <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    Github \u5ba2\u6237\u7aef <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ijaysdev <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5e38\u5e74\u7528 Tortoise Git \u3002\u3002Source Tree \u7528\u8d77\u6765\u603b\u89c9\u5f97\u6ca1\u6709\u5c0f\u6d77\u9f9f\u7b80\u7ec3\uff0c\u82b1\u91cc\u80e1\u54e8\u7684 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : TomatoYuyuko <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @TomatoYuyuko \u54c8\u54c8\uff0c\u56e0\u4e3a\u4f60\u7684\u601d\u7ef4 \u56fa\u5316\u4e86\uff0c\u63a5\u6536\u4e0d\u4e86 \u4f18\u79c0\u7684\u8bbe\u8ba1\u3002\u4f60\u8981\u52aa\u529b\u5b66\u4e60\u522b\u4eba\u4f18\u79c0\u7684\u4e1c\u897f\uff0c\u4f18\u79c0\u7684\u4eba\u601d\u7ef4\u65b9\u5f0f\u662f\u600e\u4e48\u6837\u7684\uff0c\u4f60\u8981\u5b66\u4e60\u4e0b\uff0c\u5148\u653e\u4e0b\u504f\u89c1\uff0c\u5c1d\u8bd5\u7406\u89e3\u4e00\u4e2a\u5de5\u5177\u7684\u8bbe\u8ba1\u601d\u60f3\u3002\u6211\u4f30\u8ba1\u4f60\u5f88\u53ef\u80fd\u7528\u7684\u662f window \u7cfb\u7edf\u3002
    @raiz \u4e3b\u4f60\u53ef\u4ee5\u4f7f\u7528 gitup mac \u4e0b\u6700\u597d\u7528\u7684\u5de5\u5177\uff0c\u975e\u5e38\u5f62\u8c61\uff0c\u53e6\u5916 vscode \u7684\u63d2\u4ef6\u4e00\u4e2a\u53eb git Graph \u4e5f\u4e0d\u9519\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : byte10 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    SmartGit <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Aynamic <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u89c9\u5f97\u547d\u4ee4\u884c\u5c31\u5f88\u597d\u7528\uff0c\u6216\u8005\u7528 magit <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : darksword21 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    source tree \u6211\u4e5f\u4e00\u76f4\u7528\u4e0d\u60ef
    \u65e9\u5e74\u8bd5\u8fc7 source tree \u548c Tortoise Git,\u90fd\u53d7\u4e0d\u4e86\u6240\u4ee5\u7528\u4e86\u4e00\u5e74\u591a\u7684\u547d\u4ee4\u884c
    \u6700\u540e\u8df3\u69fd\u77e5\u9053\u4e86 smartgit \u624d\u8131\u79bb\u4e86\u547d\u4ee4\u884c\u82e6\u6d77 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : xmt328 <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6bd4\u8f83\u65b0\u7248\u7684 Idea \uff08\u5927\u6982\u53bb\u5e74\u52a0\u7684\u529f\u80fd\uff09\uff0c\u652f\u6301\u7528\u4f5c\u8f7b\u91cf\u7ea7\u7f16\u8f91\u5668\u548c\u5bf9\u6bd4\uff08 merge \uff09\u529f\u80fd\uff0c\u542f\u52a8\u5f88\u5feb\uff0c\u5982\u679c Idea \u672c\u6765\u5c31\u5f00\u7740\u7684\u8bdd\u662f\u65e0\u5ef6\u8fdf\u5f00\u7684\u3002
    Editor\uff1apathtoidea64.exe foo.java
    Diff tool: pathtoidea64.exe diff foo.java bat.java <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : psyche <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    Source Tree \u53ef\u4ee5\u9009\u63d2\u4ef6\u7684\u5427
    \u7528 beyond compare merge \u5c31\u53ef\u4ee5\u4e86
    \u4e0d\u8fc7\u6211\u4e0a\u6b21\u5728 mac \u4e0a\u8001\u662f\u914d\u5931\u8d25\u4e5f\u4e0d\u77e5\u9053\u4e3a\u5565.. <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : abelmakihara <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    fork.dev \u6bd4 Source Tree \u597d\u7528 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : arnoldxiao <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u90a3\u5c31\u76f4\u63a5\u7528 idea \u5f53 git \u5de5\u5177\u5457\u3002
    u1s1 idea \u7684\u6e90\u7801\u63a7\u5236\u63d0\u4f9b\u4e86\u6bd4 git \u66f4\u591a\u7684\u529f\u80fd\uff0c\u786e\u5b9e\u633a\u597d\u7528 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : xcstream <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u7b2c\u4e00\u6b21\u53d1\u8a00…\u8bf4\u4e2a low \u4e00\u70b9\u7684, \u7528 vscode \u6253\u5f00\u6587\u4ef6\u5939, \u7136\u540e\u7528 vscode \u91cc\u96c6\u6210\u7684\u529f\u80fd\u5f88\u65b9\u4fbf…\u5927\u5bb6\u90fd\u4e0d\u8fd9\u4e48\u7528\u5417?<\/p>\n

    \u5176\u4ed6\u529f\u80fd\u76f4\u63a5\u547d\u4ee4\u884c, \u88c5\u4e86 sourcetree \u540e\u5c31\u6ca1\u7528\u8fc7, \u4e0e\u5176\u6bcf\u4e2a\u8f6f\u4ef6\u627e\u529f\u80fd, \u4e0d\u5982\u76f4\u63a5\u547d\u4ee4\u884c <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : MarvinF <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u642d\u8f66\u95ee\u4e00\u4e0b\uff0candroid studio \u80fd\u505a java \u5f00\u53d1\u5417\uff1f \u8b6c\u5982 spring + mybatis \u5f00\u53d1\uff1f \u60f3\u7a7a\u4e86\u5b66\u5b66 java, \u8c22\u8c22\uff01 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : PopRain <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    @PopRain \u76f4\u63a5 IDEA \u793e\u533a\u7248\u5457\u3002MyBatis \u63d2\u4ef6\u514d\u8d39\u7684\u3002Spring \u63d2\u4ef6\u4e5f\u6709\uff0c\u5c31\u662f\u6ca1\u6709\u65d7\u8230\u7248\u90a3\u4e48\u5f3a\u5927\u5c31\u662f\u4e86\u3002AS \u5c31\u662f\u57fa\u4e8e\u793e\u533a\u7248\u505a\u7684\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : monetto <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u547d\u4ee4\u884c\u4ed6\u4e0d\u9999\u5417 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : zsc8917zsc <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    fork \u8d3c\u597d\u7528\uff0c\u6709 windows \u3001mac \u7248 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : ruzztok <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    idea -e<\/p>\n

    https:\/\/blog.jetbrains.com\/idea\/2020\/10\/intellij-idea-2020-3-eap4\/ <\/p><\/div>\n<\/p><\/div>\n<\/li>\n

  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : SoloCompany <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u5c31 IDEA \u548c\u547d\u4ee4\u884c\u5427\u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : Takamine <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u8bd5\u8bd5 Git Extensions <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n
    \n
    \n
    \u8cc7\u6df1\u5927\u4f6c : xaplux <\/span> <\/div>\n
    <\/i> <\/span> <\/div>\n<\/p><\/div>\n
    \u6211\u4e3b\u8981\u662f\u9879\u76ee\u7c7b\u578b\u6bd4\u8f83\u591a\uff0c\u6709\u5d4c\u5165\u5f0f\u7684\uff0c\u524d\u7aef\u7684\uff0candroid app\uff0cmcu \u7684\u6240\u4ee5\u4e4b\u524d\u7528 source tree\uff0c\u7edf\u4e00\u4e00\u70b9\uff0c\u8bd5\u8fc7\u51e0\u4e2a\u611f\u89c9\u90fd\u6ca1 idea \u7684\u8212\u670d\uff0c \u540e\u9762\u8bd5\u8bd5 idea light edit mode \u3002 <\/div>\n<\/p><\/div>\n<\/li>\n
  • \n","protected":false},"excerpt":{"rendered":"

    \u4e60\u60ef\u4e86 Android Studi…<\/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\/280116"}],"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=280116"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/280116\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=280116"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=280116"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=280116"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}