{"id":37476,"date":"2022-11-20T04:08:19","date_gmt":"2023-09-01T16:01:53","guid":{"rendered":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/"},"modified":"2024-04-29T01:33:28","modified_gmt":"2024-04-28T17:33:28","slug":"%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4","status":"publish","type":"post","link":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/","title":{"rendered":"\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4"},"content":{"rendered":"

\u9996\u5148<\/h1>\n

\u8fd9\u662f\u4e00\u4e2a\u57282020\u5e748\u6708\u5165\u804c\u7684\u65b0\u5de5\u7a0b\u5e08\u3002<\/p>\n

\u56e0\u4e3agit\u547d\u4ee4\u5f88\u590d\u6742\uff0c\u6240\u4ee5\u6211\u51b3\u5b9a\u4f7f\u7528SourceTree…
\n\u4e00\u76f4\u4ee5\u6765\u90fd\u5728\u4f7f\u7528SourceTree…<\/p>\n

\u4e00\u4e2a\u6708\u524d\u7684\u65f6\u5019\uff0c\u6211\u9047\u5230\u4e86\u4e00\u4e2a\u524d\u8f88\u3002<\/p>\n

\u300c\u7981\u6b62\u4f7f\u7528SourceTree\uff01\uff01\uff01\u5728\u4e0d\u719f\u6089Git\u547d\u4ee4\u4e4b\u524d\uff0c\u81f3\u5c11\u9700\u8981\u4e00\u5e74\u6642\u9593\u719f\u7df4Git\u64cd\u4f5c\uff01\uff01\uff01\uff01\uff01\uff01\uff01\u300d<\/p>\n

\u975e\u5e38\u611f\u8c22\u60a8\u7684\u9f13\u52b1\u548c\u6307\u5bfc\uff08\u5b9e\u9645\u4e0a\u60a8\u7684\u8bdd\u66f4\u6e29\u548c\u4e00\u4e9b\uff09\u3002\u6211\u6253\u7b97\u5c06\u6211\u4ee5\u524d\u4f7f\u7528\u7684Git\u547d\u4ee4\u548c\u7528\u6cd5\u7b49\u8bb0\u5f55\u4e0b\u6765\u4f5c\u4e3a\u5907\u5fd8\u5f55\u3002<\/p>\n

\u8fdc\u7a0b\u5b58\u50a8\u5e93\u7684\u7f51\u5740
\nhttps:\/\/github.com\/\u25ef\u25ef\u25ef\u25ef\/\u25ef\u25ef\u25ef\u25ef.git<\/p>\n

\u5f00\u53d1\u5206\u652f
\n\u4e00\u4e2a\u4ece\u4e3b\u5206\u652f(master)\u5207\u51fa\u6765\u7684\u5206\u652f\u3002\u5c06\u5de5\u4f5c\u5206\u652f\u5408\u5e76\u5230\u8fd9\u91cc\u3002<\/p>\n

\u81ea\u5df1\u7684\u5de5\u4f5c\u5206\u652f
\n\u529f\u80fd\/\u6d4b\u8bd5
\n\u4ece\u5f00\u53d1\u5206\u652f\u65b0\u5efa\u7684\u5206\u652f\u3002\u7528\u4e8e\u6dfb\u52a0\u6216\u4fee\u6b63\u529f\u80fd\u3002<\/p>\n

\u5c06\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6e90\u4ee3\u7801\u514b\u9686\u5230\u672c\u5730\u3010git clone\u3011\u3002<\/h2>\n
$ git clone https:\/\/github.com\/\u25ef\u25ef\u25ef\u25ef\/\u25ef\u25ef\u25ef\u25ef.git\r\n<\/code><\/pre>\n
\u76f4\u5230\u5c06\u4ee3\u7801\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93…<\/h2>\n
\/\/ development\u30d6\u30e9\u30f3\u30c1\u3067<\/span>\r\n$<\/span> git<\/span> checkout<\/span> -<\/span>b<\/span> feature<\/span>\/<\/span>test<\/span>\r\n\r\n\/\/ \u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u306e\u78ba\u8a8d<\/span>\r\n$<\/span> git<\/span> branch<\/span>\r\n\r\n\/\/ \u30b9\u30c6\u30fc\u30b8\u30f3\u30b0\u306b\u8ffd\u52a0\u30fb\u30b3\u30df\u30c3\u30c8<\/span>\r\n$<\/span> git<\/span> add<\/span> .<\/span>\r\n$<\/span> git<\/span> commit<\/span> -<\/span>m<\/span> '\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8'<\/span>\r\n\r\n\/\/ \u30d6\u30e9\u30f3\u30c1\u3092\u79fb\u52d5<\/span>\r\n$<\/span> git<\/span> checkout<\/span> development<\/span>\r\n\r\n\/\/ \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u306e\u5dee\u5206\u3092\u78ba\u8a8d<\/span>\r\n$<\/span> git<\/span> fetch<\/span>\r\n\r\n\/\/ \u30ea\u30e2\u30fc\u30c8\u306edevelopment\u306e\u6700\u65b0\u30bd\u30fc\u30b9\u3092\u30ed\u30fc\u30ab\u30eb\u306edevelopment\u306b\u30d7\u30eb<\/span>\r\n$<\/span> git<\/span> pull<\/span> origin<\/span> development<\/span>\r\n\r\n\/\/ \u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u306b\u79fb\u52d5<\/span>\r\n$<\/span> git<\/span> checkout<\/span> feature<\/span>\/<\/span>test<\/span>\r\n\r\n\/\/ \u30ed\u30fc\u30ab\u30eb\u306edevelopment\u30d6\u30e9\u30f3\u30c1\u306e\u30bd\u30fc\u30b9\u3092feature\/test\u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8<\/span>\r\n$<\/span> git<\/span> merge<\/span> development<\/span>\r\n\r\n\/\/ \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u306a\u3044\u304b\u78ba\u8a8d<\/span>\r\n$<\/span> git<\/span> status<\/span>\r\n\r\n\/\/ \u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u30d7\u30c3\u30b7\u30e5<\/span>\r\n$<\/span> git<\/span> push<\/span> origin<\/span> feature<\/span>\/<\/span>test<\/span>\r\n\r\n\/\/ Github\u4e0a\u3067\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u4f5c\u6210\uff01<\/span>\r\n\/\/ Github\u304b\u3089development\u306b\u30de\u30fc\u30b8\u3057\u305f\u3089\u3001\u30ea\u30e2\u30fc\u30c8\u306edevelopment\u3082\u6700\u65b0\u306b\u3057\u3066\u304a\u304f<\/span>\r\n$<\/span> git<\/span> checkout<\/span> development<\/span>\r\n$<\/span> git<\/span> pull<\/span> origin<\/span> development<\/span>\r\n<\/code><\/pre>\n
\u63d0\u4ea4\u540e\uff0c\u6211\u4ece\u524d\u8f88\u90a3\u91cc\u5b66\u5230\u4e86\u5982\u4f55\u5b89\u5168\u5730\u5c06\u66f4\u6539\u63a8\u9001\u5230\u8fdc\u7a0b\u5206\u652f\u3002<\/p>\n
\u5217\u51fa\u672c\u5730\u5206\u652f\u3010git branch\u3011\u3002<\/h2>\n
\u6211\u73b0\u5728\u5728\u54ea\u4e2a\u672c\u5730\u5206\u652f\uff1f
\n\u7528\u4e8e\u786e\u8ba4\u6211\u5f53\u524d\u6240\u5728\u7684\u5206\u652f\u3002<\/p>\n
$<\/span> git<\/span> branch<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\n*<\/span> development<\/span>\r\n  feature<\/span>\/<\/span>test<\/span>\r\n<\/code><\/pre>\n
\u5f53\u524d\u5206\u652f\u662f\u6709\u300c*\u300d\u7684\u5730\u65b9\u3002<\/p>\n
“\u3010git branch -r\u3011\u663e\u793a\u8fdc\u7a0b\u5206\u652f”<\/h2>\n
\u4f7f\u7528-r\u6216–remotes\u9009\u9879\u3002<\/p>\n
$<\/span> git<\/span> branch<\/span> -<\/span>r<\/span>\r\n$<\/span> git<\/span> branch<\/span> --<\/span>remotes<\/span>\r\n<\/code><\/pre>\n
\u3010git branch -a\u3011\u663e\u793a\u6240\u6709\u672c\u5730\u548c\u8fdc\u7a0b\u5206\u652f\u3002<\/h2>\n
\u5728\u547d\u4ee4\u540e\u52a0\u4e0a -a \u6216 –all \u9009\u9879\u3002<\/p>\n
$<\/span> git<\/span> branch<\/span> -<\/span>a<\/span>\r\n$<\/span> git<\/span> branch<\/span> --<\/span>all<\/span>\r\n<\/code><\/pre>\n
\u521b\u5efa\u5e76\u5207\u6362\u5230\u4e00\u4e2a\u65b0\u7684\u5206\u652f\uff1a\u3010git checkout -b\u3011<\/h2>\n
\u7531\u4e8e\u5c06\u4ece\u5f53\u524d\u5206\u652f\u5207\u6362\u5230\u65b0\u5206\u652f\uff0c\u8bf7\u786e\u4fdd\u77e5\u9053\u5f53\u524d\u5206\u652f\u662f\u54ea\u4e2a\u3002<\/p>\n
$<\/span> git<\/span> checkout<\/span> -<\/span>b<\/span> feature<\/span>\/<\/span>test<\/span>\r\n\r\n$<\/span> git<\/span> branch<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\n  development<\/span>\r\n*<\/span> feature<\/span>\/<\/span>test<\/span>\r\n<\/code><\/pre>\n
\u5c06\u8fdc\u7a0b\u5206\u652f\u63d0\u53d6\u5230\u672c\u5730\u5e76\u5207\u6362\u5230\u8be5\u5206\u652f\u3002<\/h2>\n
\u5982\u679c\u8981\u5c06\u8fdc\u7a0b\u5b58\u50a8\u5e93\u7684new_branch\u5206\u652f\u62c9\u5230\u672c\u5730<\/p>\n
$<\/span> git<\/span> checkout<\/span> -<\/span>b<\/span> new_branch<\/span> origin<\/span>\/<\/span>new_branch<\/span>\r\n\r\n$<\/span> git<\/span> branch<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\n  development<\/span>\r\n  feature<\/span>\/<\/span>test<\/span>\r\n*<\/span> new_branch<\/span> \/\/ \u30ea\u30e2\u30fc\u30c8\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u8ffd\u52a0\u3055\u308c\u3066\u3044\u308b<\/span>\r\n<\/code><\/pre>\n
\u5c06\u7f16\u8f91\u3001\u6dfb\u52a0\u6216\u5220\u9664\u7684\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u3010git add\u3011\u3002<\/h2>\n
\u6dfb\u52a0\u8981\u63d0\u4ea4\u7684\u6587\u4ef6\u3002<\/p>\n
\u5c06\u6240\u6709\u5df2\u66f4\u6539\u7684\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u3002<\/p>\n
$<\/span> git<\/span> add<\/span> .<\/span>\r\n<\/code><\/pre>\n
\u6211\u5e0c\u671b\u4e3a\u6bcf\u4e2a\u6587\u4ef6\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u3002<\/p>\n
$<\/span> git<\/span> add<\/span> welcome<\/span>.<\/span>blade<\/span>.<\/span>php<\/span>\r\n<\/code><\/pre>\n
\u5c06\u6dfb\u52a0\u5230\u6682\u5b58\u533a\u7684\u6587\u4ef6\u8bb0\u5f55\u5230\u672c\u5730\u4ed3\u5e93\u3010git commit\u3011\u3002<\/h2>\n
\u5728\u67e5\u770b git log \u4e2d\u7684\u63d0\u4ea4\u5386\u53f2\u65f6\uff0c
\n\u8981\u5199\u51fa\u80fd\u591f\u4e00\u773c\u770b\u51fa\u505a\u4e86\u4ec0\u4e48\u7684\u6d88\u606f\uff01<\/p>\n
$<\/span> git<\/span> commit<\/span> -<\/span>m<\/span> '\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8'<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\n[<\/span>development<\/span> fbcdc2f<\/span>]<\/span> \u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8<\/span>\r\n 1<\/span> file<\/span> changed<\/span>,<\/span> 1<\/span> insertion<\/span>(<\/span>+<\/span>),<\/span> 1<\/span> deletion<\/span>(<\/span>-<\/span>)<\/span>\r\n<\/code><\/pre>\n
\u3010git checkout [\u5206\u652f\u540d\u79f0]\u3011\u79fb\u52a8\u5230\u6307\u5b9a\u5206\u652f\u3002<\/h2>\n
\u5f53\u60a8\u60f3\u5207\u6362\u5230\u5176\u4ed6\u5206\u652f\u65f6\uff0c\u8bf7\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c\u3002<\/p>\n
$<\/span> git<\/span> branch<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\n  development<\/span>\r\n*<\/span> feature<\/span>\/<\/span>test<\/span> \/\/ \u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1<\/span>\r\n\r\n$<\/span> git<\/span> checkout<\/span> development<\/span>\r\n\r\n$<\/span> git<\/span> branch<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\n*<\/span> development<\/span> \/\/ \u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1 \u300c*\u300d\u304c\u79fb\u52d5\u3057\u3066\u3044\u308b<\/span>\r\n  feature<\/span>\/<\/span>test<\/span>\r\n<\/code><\/pre>\n
\u4ece\u8fdc\u7a0b\u5b58\u50a8\u5e93\u83b7\u53d6\u6700\u65b0\u7684\u4fe1\u606f<\/h2>\n
\u672c\u5730\u5b58\u50a8\u5e93\u7684 origin\/development \u5206\u652f\u5df2\u66f4\u65b0\u4e3a\u6700\u65b0\u7248\u672c\u3002
\n\u5728\u6b64\u65f6\uff0c\u6211\u7684\u5de5\u4f5c\u6587\u4ef6\u7b49\u4e0d\u4f1a\u88ab\u66f4\u6539\u3002<\/p>\n
$<\/span> git<\/span> fetch<\/span>\r\n<\/code><\/pre>\n
\u3010git merge\u3011\u5c06\u83b7\u53d6\u7684\u6700\u65b0\u4fe1\u606f\u5408\u5e76\u5230\u5f53\u524d\u5206\u652f\u4e2d\u3002<\/h2>\n
\u8fdb\u884c git fetch \u540e\u66f4\u65b0\u6700\u65b0\u4fe1\u606f\u3002
\n\u6267\u884c\u5230\u8fd9\u4e00\u6b65\uff0c\u4f1a\u540c\u65f6\u66f4\u6539\u81ea\u5df1\u7684\u5de5\u4f5c\u6587\u4ef6\u3002<\/p>\n
$<\/span> git<\/span> merge<\/span> origin<\/span>\/<\/span>development<\/span>\r\n<\/code><\/pre>\n
git pull\u547d\u4ee4\u7528\u4e8e\u5c06\u8fdc\u7a0b\u5e93\u7684\u6700\u65b0\u6e90\u4ee3\u7801\u62c9\u53d6\u5230\u672c\u5730\u5e93\u4e2d\u3002<\/h2>\n
\u6211\u4e00\u6b21\u6027\u6267\u884c\u4e86git fetch\u548cgit merge\u3002<\/p>\n
$<\/span> git<\/span> pull<\/span> origin<\/span> development<\/span>\r\n<\/code><\/pre>\n
\u663e\u793a\u81ea\u4e0a\u4e00\u6b21\u63d0\u4ea4\u4ee5\u6765\u7684\u66f4\u6539\u5185\u5bb9\u3010git status\u3011\u3002<\/h2>\n
\u6211\u6dfb\u52a0\u8fc7\u5417\uff1f
\n\u6211\u63d0\u4ea4\u8fc7\u5417\uff1f
\n\u73b0\u5728\u662f\u4ec0\u4e48\u72b6\u6001\uff1f
\n\u7528\u4e8e\u786e\u8ba4\u65f6\u4f7f\u7528\u3002<\/p>\n
\u5728\u6267\u884cgit add\u4e4b\u524d\u2193<\/p>\n
$<\/span> git<\/span> status<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\nOn<\/span> branch<\/span> development<\/span>\r\nYour<\/span> branch<\/span> is<\/span> up<\/span> to<\/span> date<\/span> with<\/span> 'origin\/development'<\/span>.<\/span>\r\n\r\nChanges<\/span> not<\/span> staged<\/span> for<\/span> commit<\/span>:<\/span>\r\n  (<\/span>use<\/span> \"git add <file>...\"<\/span> to<\/span> update<\/span> what<\/span> will<\/span> be<\/span> committed<\/span>)<\/span>\r\n  (<\/span>use<\/span> \"git restore <file>...\"<\/span> to<\/span> discard<\/span> changes<\/span> in<\/span> working<\/span> directory<\/span>)<\/span>\r\n\tmodified<\/span>:<\/span>   Test<\/span>\/<\/span>resources<\/span>\/<\/span>views<\/span>\/<\/span>welcome<\/span>.<\/span>blade<\/span>.<\/span>php<\/span>\r\n\r\nno<\/span> changes<\/span> added<\/span> to<\/span> commit<\/span> (<\/span>use<\/span> \"git add\"<\/span> and<\/span>\/<\/span>or<\/span> \"git commit -a\"<\/span>)<\/span>\r\n<\/code><\/pre>\n
\u5728git add\u4e4b\u540e\uff0cgit commit\u4e4b\u524d\u5728\u4e0b\u65b9\u3002<\/p>\n
$<\/span> git<\/span> status<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\nOn<\/span> branch<\/span> development<\/span>\r\nYour<\/span> branch<\/span> is<\/span> up<\/span> to<\/span> date<\/span> with<\/span> 'origin\/development'<\/span>.<\/span>\r\n\r\nChanges<\/span> to<\/span> be<\/span> committed<\/span>:<\/span>\r\n  (<\/span>use<\/span> \"git restore --staged <file>...\"<\/span> to<\/span> unstage<\/span>)<\/span>\r\n\tmodified<\/span>:<\/span>   Test<\/span>\/<\/span>resources<\/span>\/<\/span>views<\/span>\/<\/span>welcome<\/span>.<\/span>blade<\/span>.<\/span>php<\/span>\r\n<\/code><\/pre>\n
\u5c06\u5728\u672c\u5730\u4ed3\u5e93\u63d0\u4ea4\u7684\u5386\u53f2\u8bb0\u5f55\u4e0a\u4f20\u5230\u8fdc\u7a0b\u4ed3\u5e93\u3002<\/h2>\n
$<\/span> git<\/span> push<\/span> origin<\/span> feature<\/span>\/<\/span>test<\/span>\r\n  .<\/span>\r\n  .<\/span>\r\n  .<\/span>\r\n  *<\/span> [<\/span>new<\/span> branch<\/span>]<\/span>      feature<\/span>\/<\/span>test<\/span> -><\/span> feature<\/span>\/<\/span>test<\/span>\r\n<\/code><\/pre>\n
\u5982\u679c\u6ca1\u6709\u9519\u8bef\u7684\u8bdd\uff0c\u5c31\u53ef\u4ee5\u5728Github\u4e0a\u521b\u5efa\u62c9\u53d6\u8bf7\u6c42\u3002
\n\u8bf7\u8fdb\u884c\u5ba1\u67e5\uff0c\u5982\u679cOK\u7684\u8bdd\u5c31\u8bf7\u4f60\u4eceGithub\u4e0a\u5408\u5e76\u5230development\u5206\u652f\u3002<\/p>\n
\u68c0\u67e5\u8fd9\u4e2agit\u4ed3\u5e93\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002<\/h2>\n
\u5728\u5217\u8868\u4e2d\u663e\u793a\u63d0\u4ea4\u6d88\u606f\u3002<\/p>\n
$<\/span> git<\/span> log<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\ncommit<\/span> 1<\/span>ab995b929ff92a4d180d7d0786e0f6496c884dd<\/span> (<\/span>origin<\/span>\/<\/span>feature<\/span>\/<\/span>test<\/span>)<\/span>\r\nAuthor<\/span>:<\/span> emika_0402<\/span> <<\/span>emika_0402<\/span>@<\/span>test<\/span>.<\/span>co<\/span>.<\/span>jp<\/span>><\/span>\r\nDate<\/span>:<\/span>   Mon<\/span> Dec<\/span> 21<\/span> 12<\/span>:<\/span>00<\/span>:<\/span>00<\/span> 2020<\/span> +<\/span>0900<\/span>\r\n\r\n    \u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8<\/span>\r\n<\/code><\/pre>\n
\u5f53\u60a8\u5e0c\u671b\u4ee5\u4e00\u884c\u663e\u793a\u63d0\u4ea4\u5386\u53f2\u65f6\uff0c\u8bf7\u4f7f\u7528\u4ee5\u4e0b\u65b9\u6cd5\u2193<\/p>\n
$<\/span> git<\/span> log<\/span> --<\/span>oneline<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\n1<\/span>ab995b<\/span> (<\/span>origin<\/span>\/<\/span>feature<\/span>\/<\/span>test<\/span>)<\/span> \u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8<\/span>\r\n<\/code><\/pre>\n
\u653e\u5f03\u6682\u5b58\u524d\u7684\u672c\u5730\u4fee\u6539\u3010git checkout\u3011\u3002<\/h2>\n
\u653e\u5f03\u6240\u6709\u66f4\u6539\u2193<\/p>\n
$<\/span> git<\/span> checkout<\/span> .<\/span>\r\n<\/code><\/pre>\n
\u653e\u5f03\u5bf9\u6307\u5b9a\u6587\u4ef6\u7684\u4fee\u6539\u3002<\/p>\n
$<\/span> git<\/span> checkout<\/span> Test<\/span>\/<\/span>resources<\/span>\/<\/span>views<\/span>\/<\/span>welcome<\/span>.<\/span>blade<\/span>.<\/span>php<\/span>\r\n<\/code><\/pre>\n
\u3010git branch -m\u3011\u4fee\u6539\u672c\u5730\u5206\u652f\u540d\u79f0<\/h2>\n
$<\/span> git<\/span> branch<\/span>\r\n*<\/span> development<\/span>\r\n  feature<\/span>\/<\/span>test<\/span>\r\n\r\n\/\/ feature\/test \u3092 feature\/test2 \u306b\u3057\u305f\u3044<\/span>\r\n$<\/span> git<\/span> branch<\/span> -<\/span>m<\/span> feature<\/span>\/<\/span>test<\/span> feature<\/span>\/<\/span>test2<\/span>\r\n\r\n$<\/span> git<\/span> branch<\/span>\r\n*<\/span> development<\/span>\r\n  feature<\/span>\/<\/span>test2<\/span>\r\n<\/code><\/pre>\n
\u3010git branch -d\u3011\u5220\u9664\u672c\u5730\u5206\u652f<\/h2>\n
\u5220\u9664\u5df2\u5408\u5e76\u7684\u672c\u5730\u5206\u652f\u65f6\u2193<\/p>\n
\u5220\u9664\u5df2\u5408\u5e76\u7684\u672c\u5730\u5206\u652f\u65f6\u2193<\/p>\n
$<\/span> git<\/span> branch<\/span> -<\/span>d<\/span> feature<\/span>\/<\/span>test<\/span>\r\n<\/code><\/pre>\n
\u65e0\u8bba\u54ea\u4e2a\u5206\u652f\u90fd\u53ef\u4ee5\u5220\u9664\u2193<\/p>\n
$<\/span> git<\/span> branch<\/span> -<\/span>D<\/span> feature<\/span>\/<\/span>test<\/span>\r\n<\/code><\/pre>\n
\u5c06\u4e0d\u60f3\u63d0\u4ea4\u7684\u66f4\u6539\u6682\u5b58\u3002<\/h2>\n
\u6211\u6b63\u5728\u8fdb\u884c\u4f5c\u4e1a\uff0c\u4f46\u662f\u60f3\u5207\u6362\u5230\u53e6\u4e00\u4e2a\u5206\u652f…
\n\u56e0\u4e3a\u6211\u5728\u9519\u8bef\u7684\u5206\u652f\u4e0a\u8fdb\u884c\u4e86\u4f5c\u4e1a\uff0c\u6240\u4ee5\u60f3\u628a\u66f4\u6539\u79fb\u5230\u53e6\u4e00\u4e2a\u5206\u652f\u4e0a…<\/p>\n
$<\/span> git<\/span> stash<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\nSaved<\/span> working<\/span> directory<\/span> and<\/span> index<\/span> state<\/span> WIP<\/span> on<\/span> \u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u540d<\/span>:<\/span> \u89aa\u30b3\u30df\u30c3\u30c8ID<\/span> \u89aa\u30b3\u30df\u30c3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8<\/span>\r\n<\/code><\/pre>\n
\u4f7f\u7528\u3010git stash save\u3011\u547d\u4ee4\u5c06\u5e26\u6ce8\u91ca\u7684\u66f4\u6539\u6682\u5b58\u8d77\u6765\u3002<\/h2>\n
$<\/span> git<\/span> stash<\/span> save<\/span> '\u30b3\u30e1\u30f3\u30c8'<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\nSaved<\/span> working<\/span> directory<\/span> and<\/span> index<\/span> state<\/span> On<\/span> \u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u540d<\/span>:<\/span> \u30b3\u30e1\u30f3\u30c8<\/span>\r\n<\/code><\/pre>\n
\u5e0c\u671b\u5c06\u65b0\u6587\u4ef6\u5b58\u50a8\u5728git stash\u4e2d\u3002<\/h2>\n
$<\/span> git<\/span> stash<\/span> -<\/span>u<\/span>\r\n<\/code><\/pre>\n
\u7528\u5e26\u6709\u6ce8\u91ca\u7684\u3010git stash save -u\u3011\u547d\u4ee4\uff0c\u60f3\u8981\u4e34\u65f6\u4fdd\u5b58\u5e26\u6709\u65b0\u6587\u4ef6\u7684\u4fee\u6539\u3002<\/h2>\n
$<\/span> git<\/span> stash<\/span> save<\/span> -<\/span>u<\/span> '\u30b3\u30e1\u30f3\u30c8'<\/span>\r\n<\/code><\/pre>\n
\u6211\u53ea\u60f3\u8981\u5c06\u7279\u5b9a\u7684\u6587\u4ef6\u63a8\u5230\u3010git stash\u3011\u3002<\/h2>\n
$<\/span> git<\/span> stash<\/span> push<\/span> --<\/span> \u30d5\u30a1\u30a4\u30eb\u540d<\/span>\r\n<\/code><\/pre>\n
\u3010git\u8fc7\u7a0b\u5217\u8868\u3011\u67e5\u770b\u5df2\u5b58\u50a8\u7684\u5185\u5bb9\u5217\u8868<\/h2>\n
stash@{0}\u88ab\u89c6\u4e3astash\u7684\u6807\u8bc6\u7b26\uff0c\u4ee3\u8868\u6700\u65b0\u7684stash\u3002<\/p>\n
$<\/span> git<\/span> stash<\/span> list<\/span>\r\n\/\/ \u5b9f\u884c\u5f8c<\/span>\r\nstash<\/span>@<\/span>{<\/span>0<\/span>}<\/span>:<\/span> WIP<\/span> on<\/span> branch3<\/span>:<\/span> 789<\/span>ijkl<\/span> third<\/span> commit<\/span>\r\nstash<\/span>@<\/span>{<\/span>1<\/span>}<\/span>:<\/span> WIP<\/span> on<\/span> branch2<\/span>:<\/span> 456<\/span>efgh<\/span> second<\/span> commit<\/span>\r\nstash<\/span>@<\/span>{<\/span>2<\/span>}<\/span>:<\/span> WIP<\/span> on<\/span> branch1<\/span>:<\/span> 123<\/span>abcd<\/span> first<\/span> commit<\/span>\r\n<\/code><\/pre>\n
\u3010\u4f7f\u7528git stash apply\u547d\u4ee4\u3011\u5c06\u88ab\u6682\u5b58\u7684\u66f4\u6539\u8fd8\u539f\u5230\u5f53\u524d\u5206\u652f\u4e0a<\/h2>\n
\/\/ \u76f4\u524d\u306e\u5909\u66f4\uff08stash@{0}\uff09\u3092\u623b\u3059<\/span>\r\n$<\/span> git<\/span> stash<\/span> apply<\/span>\r\n\r\n\/\/ \u7279\u5b9a\u306estash\u3092\u6307\u5b9a\u3057\u3066\u623b\u3059<\/span>\r\n$<\/span> git<\/span> stash<\/span> apply<\/span> stash<\/span>@<\/span>{<\/span>2<\/span>}<\/span>\r\n<\/code><\/pre>\n
\u3010git stash drop\u3011\u5220\u9664\u88ab\u4e34\u65f6\u50a8\u5b58\u7684\u66f4\u6539<\/h2>\n
\/\/ \u76f4\u524d\u306e\u5909\u66f4\uff08stash@{0}\uff09\u3092\u524a\u9664\u3059\u308b<\/span>\r\n$<\/span> git<\/span> stash<\/span> drop<\/span>\r\n\r\n\/\/ \u7279\u5b9a\u306estash\u3092\u6307\u5b9a\u3057\u3066\u524a\u9664\u3059\u308b<\/span>\r\n$<\/span> git<\/span> stash<\/span> drop<\/span> stash<\/span>@<\/span>{<\/span>2<\/span>}<\/span>\r\n<\/code><\/pre>\n
\u3010git stash pop\u3011\u5c06\u5df2\u9690\u85cf\u7684\u66f4\u6539\u6062\u590d\u5230\u5f53\u524d\u5206\u652f\u5e76\u4ece\u5217\u8868\u4e2d\u79fb\u9664<\/h2>\n
\u4e00\u8d77\u5b8c\u6210git stash apply\u548cgit stash drop\u7684\u64cd\u4f5c\u3002<\/p>\n
\/\/ \u76f4\u524d\u306e\u5909\u66f4\uff08stash@{0}\uff09\u3092\u623b\u3059<\/span>\r\n$<\/span> git<\/span> stash<\/span> pop<\/span>\r\n\r\n\/\/ \u7279\u5b9a\u306estash\u3092\u6307\u5b9a\u3057\u3066\u623b\u3059<\/span>\r\n$<\/span> git<\/span> stash<\/span> pop<\/span> stash<\/span>@<\/span>{<\/span>1<\/span>}<\/span>\r\n<\/code><\/pre>\n
\u3010git stash clear\u3011\u6e05\u9664\u6240\u6709\u5907\u4efd\u7684\u53d8\u66f4<\/h2>\n
\u5f53\u60a8\u5e0c\u671b\u5220\u9664\u201cgit stash list\u201d\u6240\u663e\u793a\u7684\u6240\u6709\u5185\u5bb9\u65f6\u3002<\/p>\n
$<\/span> git<\/span> stash<\/span> clear<\/span>\r\n<\/code><\/pre>\n
\u6700\u540e… …)<\/h2>\n
\u6211\u5e0c\u671b\u80fd\u591f\u4e0d\u65ad\u589e\u52a0\u65b0\u4f7f\u7528\u7684git\u547d\u4ee4\uff01<\/p>\n","protected":false},"excerpt":{"rendered":"
\u9996\u5148 \u8fd9\u662f\u4e00\u4e2a\u57282020\u5e748\u6708\u5165\u804c\u7684\u65b0\u5de5\u7a0b\u5e08\u3002 \u56e0\u4e3agit\u547d\u4ee4\u5f88\u590d\u6742\uff0c\u6240\u4ee5\u6211\u51b3\u5b9a\u4f7f\u7528SourceTree&#8 […]<\/p>\n","protected":false},"author":8,"featured_media":0,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-37476","post","type-post","status-publish","format-standard","hentry","category-uncategorized"],"yoast_head":"\n\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4 - Blog - Silicon Cloud<\/title>\n<meta name=\"robots\" content=\"index, follow, max-snippet:-1, max-image-preview:large, max-video-preview:-1\" \/>\n<link rel=\"canonical\" href=\"https:\/\/www.silicloud.com\/zh\/blog\/\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4\/\" \/>\n<meta property=\"og:locale\" content=\"zh_CN\" \/>\n<meta property=\"og:type\" content=\"article\" \/>\n<meta property=\"og:title\" content=\"\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4\" \/>\n<meta property=\"og:description\" content=\"\u9996\u5148 \u8fd9\u662f\u4e00\u4e2a\u57282020\u5e748\u6708\u5165\u804c\u7684\u65b0\u5de5\u7a0b\u5e08\u3002 \u56e0\u4e3agit\u547d\u4ee4\u5f88\u590d\u6742\uff0c\u6240\u4ee5\u6211\u51b3\u5b9a\u4f7f\u7528SourceTree&#8 […]\" \/>\n<meta property=\"og:url\" content=\"https:\/\/www.silicloud.com\/zh\/blog\/\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4\/\" \/>\n<meta property=\"og:site_name\" content=\"Blog - Silicon Cloud\" \/>\n<meta property=\"article:published_time\" content=\"2023-09-01T16:01:53+00:00\" \/>\n<meta property=\"article:modified_time\" content=\"2024-04-28T17:33:28+00:00\" \/>\n<meta name=\"author\" content=\"\u96c5, \u609f\" \/>\n<meta name=\"twitter:card\" content=\"summary_large_image\" \/>\n<meta name=\"twitter:label1\" content=\"\u4f5c\u8005\" \/>\n\t<meta name=\"twitter:data1\" content=\"\u96c5, \u609f\" \/>\n\t<meta name=\"twitter:label2\" content=\"\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4\" \/>\n\t<meta name=\"twitter:data2\" content=\"3 \u5206\" \/>\n<script type=\"application\/ld+json\" class=\"yoast-schema-graph\">{\"@context\":\"https:\/\/schema.org\",\"@graph\":[{\"@type\":\"WebPage\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/\",\"name\":\"\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4 - Blog - Silicon Cloud\",\"isPartOf\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\"},\"datePublished\":\"2023-09-01T16:01:53+00:00\",\"dateModified\":\"2024-04-28T17:33:28+00:00\",\"author\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6\"},\"breadcrumb\":{\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/#breadcrumb\"},\"inLanguage\":\"zh-Hans\",\"potentialAction\":[{\"@type\":\"ReadAction\",\"target\":[\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/\"]}]},{\"@type\":\"BreadcrumbList\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/#breadcrumb\",\"itemListElement\":[{\"@type\":\"ListItem\",\"position\":1,\"name\":\"\u9996\u9875\",\"item\":\"https:\/\/www.silicloud.com\/zh\/blog\/\"},{\"@type\":\"ListItem\",\"position\":2,\"name\":\"\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4\"}]},{\"@type\":\"WebSite\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#website\",\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/\",\"name\":\"Blog - Silicon Cloud\",\"description\":\"\",\"inLanguage\":\"zh-Hans\"},{\"@type\":\"Person\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6\",\"name\":\"\u96c5, \u609f\",\"image\":{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/\",\"url\":\"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g\",\"contentUrl\":\"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g\",\"caption\":\"\u96c5, \u609f\"},\"url\":\"https:\/\/www.silicloud.com\/zh\/blog\/author\/yawu\/\"},{\"@type\":\"ImageObject\",\"inLanguage\":\"zh-Hans\",\"@id\":\"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/#local-main-organization-logo\",\"url\":\"\",\"contentUrl\":\"\",\"caption\":\"Blog - Silicon Cloud\"}]}<\/script>\n<!-- \/ Yoast SEO Premium plugin. -->","yoast_head_json":{"title":"\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4 - Blog - Silicon Cloud","robots":{"index":"index","follow":"follow","max-snippet":"max-snippet:-1","max-image-preview":"max-image-preview:large","max-video-preview":"max-video-preview:-1"},"canonical":"https:\/\/www.silicloud.com\/zh\/blog\/\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4\/","og_locale":"zh_CN","og_type":"article","og_title":"\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4","og_description":"\u9996\u5148 \u8fd9\u662f\u4e00\u4e2a\u57282020\u5e748\u6708\u5165\u804c\u7684\u65b0\u5de5\u7a0b\u5e08\u3002 \u56e0\u4e3agit\u547d\u4ee4\u5f88\u590d\u6742\uff0c\u6240\u4ee5\u6211\u51b3\u5b9a\u4f7f\u7528SourceTree […]","og_url":"https:\/\/www.silicloud.com\/zh\/blog\/\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4\/","og_site_name":"Blog - Silicon Cloud","article_published_time":"2023-09-01T16:01:53+00:00","article_modified_time":"2024-04-28T17:33:28+00:00","author":"\u96c5, \u609f","twitter_card":"summary_large_image","twitter_misc":{"\u4f5c\u8005":"\u96c5, \u609f","\u9884\u8ba1\u9605\u8bfb\u65f6\u95f4":"3 \u5206"},"schema":{"@context":"https:\/\/schema.org","@graph":[{"@type":"WebPage","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/","url":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/","name":"\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4 - Blog - Silicon Cloud","isPartOf":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website"},"datePublished":"2023-09-01T16:01:53+00:00","dateModified":"2024-04-28T17:33:28+00:00","author":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6"},"breadcrumb":{"@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/#breadcrumb"},"inLanguage":"zh-Hans","potentialAction":[{"@type":"ReadAction","target":["https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/"]}]},{"@type":"BreadcrumbList","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/#breadcrumb","itemListElement":[{"@type":"ListItem","position":1,"name":"\u9996\u9875","item":"https:\/\/www.silicloud.com\/zh\/blog\/"},{"@type":"ListItem","position":2,"name":"\u7b2c\u4e00\u6b21\u4f7f\u7528git\u547d\u4ee4"}]},{"@type":"WebSite","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#website","url":"https:\/\/www.silicloud.com\/zh\/blog\/","name":"Blog - Silicon Cloud","description":"","inLanguage":"zh-Hans"},{"@type":"Person","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/f044a4b7fa4ee2701702942002419ca6","name":"\u96c5, \u609f","image":{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/#\/schema\/person\/image\/","url":"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g","contentUrl":"https:\/\/secure.gravatar.com\/avatar\/e71a913e914f1aad1efc391f92084294bac54bc782acd289638580134cf667a6?s=96&d=mm&r=g","caption":"\u96c5, \u609f"},"url":"https:\/\/www.silicloud.com\/zh\/blog\/author\/yawu\/"},{"@type":"ImageObject","inLanguage":"zh-Hans","@id":"https:\/\/www.silicloud.com\/zh\/blog\/%e7%ac%ac%e4%b8%80%e6%ac%a1%e4%bd%bf%e7%94%a8git%e5%91%bd%e4%bb%a4\/#local-main-organization-logo","url":"","contentUrl":"","caption":"Blog - Silicon Cloud"}]}},"_links":{"self":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37476","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/users\/8"}],"replies":[{"embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/comments?post=37476"}],"version-history":[{"count":2,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37476\/revisions"}],"predecessor-version":[{"id":71972,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/posts\/37476\/revisions\/71972"}],"wp:attachment":[{"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/media?parent=37476"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/categories?post=37476"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.silicloud.com\/zh\/blog\/wp-json\/wp\/v2\/tags?post=37476"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}