{"id":1178,"date":"2021-11-20T20:28:38","date_gmt":"2021-11-20T12:28:38","guid":{"rendered":"https:\/\/summid.icu\/?p=1178"},"modified":"2022-05-14T15:31:13","modified_gmt":"2022-05-14T07:31:13","slug":"git-for-unity","status":"publish","type":"post","link":"https:\/\/summid.icu\/index.php\/2021\/11\/20\/git-for-unity\/","title":{"rendered":"Git for Unity \u7684\u8c03\u6559\u624b\u518c"},"content":{"rendered":"<p><span style=\"font-family: 'Microsoft YaHei', 'Microsoft JhengHei', \u9ed1\u4f53;\">\u672c\u6587\u7ae0\u7ffb\u8bd1\u81ea\uff1a<a href=\"https:\/\/hextantstudios.com\/unity-using-git\/\" target=\"_blank\" rel=\"noopener\">https:\/\/hextantstudios.com\/unity-using-git\/<\/a><\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u5728Unity\u9879\u76ee\u4e2d\u4f7f\u7528Git\u4f5c\u4e3a\u7248\u672c\u63a7\u5236\u624b\u6bb5\u4e4b\u524d\uff0c\u9700\u8981\u8fdb\u884c\u4e00\u4e9b\u7b80\u5355\u7684\u521d\u59cb\u5316\u8bbe\u7f6e\uff0c\u8fd9\u4e9b\u64cd\u4f5c\u90fd\u53ef\u4ee5\u5728\u547d\u4ee4\u884c\u4e2d\u5feb\u901f\u5b8c\u6210\u3002\u672c\u6587\u4ecb\u7ecd\u5982\u4f55\u4f7f\u7528Git\u548cLFS\uff08Large Files Storage\uff0c\u5927\u6587\u4ef6\u5b58\u50a8\uff09\u521d\u59cb\u5316\u4e00\u4e2a\u65b0\u9879\u76ee\uff0c\u4ee5\u5904\u7406\u6e38\u620f\u5f00\u53d1\u6240\u9700\u7684\u5927\u91cf\u4e8c\u8fdb\u5236\u6587\u4ef6\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading md-focus\"><span class=\"md-plain md-expand\">\u914d\u7f6eGit\u4ee5\u9002\u5e94Unity\u9879\u76ee<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u4e0a\u9762\u8bf4\u5230\u6211\u4eec\u9700\u8981\u505a\u4e00\u4e9b\u5fc5\u8981\u7684Git\u8bbe\u7f6e\u6765\u8ba9\u5176\u66f4\u597d\u914d\u5408Unity\u9879\u76ee\uff0c\u4f46\u5728\u6b64\u4e4b\u524d\uff0c\u6211\u4eec\u5148\u6765\u770b\u770bUnity\u7684\u57fa\u672c\u8bbe\u7f6e\u3002\u4e0b\u9762\u5217\u51fa\u7684\u8bbe\u7f6e\u9879\u4e3a\u8f83\u65b0\u7248Unity\uff082020.3\uff09\u7684\u9ed8\u8ba4\u8bbe\u7f6e\uff0c\u867d\u7136\u5b83\u4eec\u901a\u5e38\u6ca1\u6709\u95ee\u9898\uff0c\u4f46\u5efa\u8bae\u8fd8\u662f\u68c0\u67e5\u4ee5\u786e\u4fdd\u4e07\u65e0\u4e00\u5931\u3002<\/span><\/p>\n<ul class=\"ul-list\" data-mark=\"-\">\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">Edit \/ Project Settings<\/span><\/p>\n<ul class=\"ul-list\" data-mark=\"-\">\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">Version Control<\/span><\/p>\n<ul class=\"ul-list\" data-mark=\"-\">\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">Mode : Visible Meta Files<\/span><\/p>\n<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n<\/li>\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">Edit \/ Project Settings \/ Editor<\/span><\/p>\n<ul class=\"ul-list\" data-mark=\"-\">\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">AssetSerialization<\/span><\/p>\n<ul class=\"ul-list\" data-mark=\"-\">\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">Mode : Force Text<\/span><\/p>\n<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n<\/li>\n<\/ul>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">Version Control \u8bbe\u7f6e\u4e3a Visible Meta Files \u786e\u4fdd\u4e86Unity\u6839\u636e\u9879\u76ee\u4e2d\u7684\u8d44\u6e90\u6587\u4ef6\u3001\u76ee\u5f55\u751f\u6210\u7684 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.meta<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u4e0d\u4f1a\u88ab\u9690\u85cf\u3002Git\u547d\u4ee4\u884c\u5ba2\u6237\u7aef\u59cb\u7ec8\u4f1a\u627e\u5230 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.meta<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\uff08\u4e0d\u8bba\u5b83\u4eec\u662f\u5426\u88ab\u9690\u85cf\uff09\uff0c\u4f46\u5c06\u5b83\u4eec\u8bbe\u7f6e\u4e3a\u53ef\u89c1\uff0c\u53ef\u4ee5\u907f\u514d\u5176\u4ed6Git\u5ba2\u6237\u7aef\u627e\u4e0d\u5230 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.meta<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u800c\u51fa\u9519\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">AssetSerialization\u8bbe\u7f6e\u4e3a Force Text \u786e\u4fddUnity\u4ee5\u6587\u672c\u7684\u65b9\u5f0f\u4fdd\u5b58\u8d44\u6e90\uff0c\u800c\u4e0d\u662f\u4ee5\u4e8c\u8fdb\u5236\u7684\u5f62\u5f0f\u3002\u8fd9\u4f7f\u5f97 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>merge<\/code><\/span><span class=\"md-plain\"> \u64cd\u4f5c\u66f4\u4e3a\u5bb9\u6613\uff0c\u5e76\u5141\u8bb8Git\u5c06\u201c\u66f4\u6539\u201d\uff08changes\uff09\u5b58\u50a8\u4e3a\u8f83\u5c0f\u7684\u589e\u91cf\u4fe1\u606f\uff0c\u800c\u4e0d\u662f\u6587\u4ef6\u7684\u5b8c\u6574\u526f\u672c\u4ee5\u8282\u7701\u5b58\u50a8\u7a7a\u95f4\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u914d\u7f6eGit\u7528\u6237\u8bbe\u7f6e<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u5728\u521b\u5efa\u6216\u8005\u514b\u9686\u4e00\u4e2aGit\u4ed3\u5e93\u4e4b\u524d\uff0c\u6700\u597d\u8bbe\u7f6e\u4e00\u4e0bGit\u7684\u7528\u6237\u8bbe\u7f6e\uff08user settings\uff09\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u8bbe\u7f6e\u7528\u6237\u540d\u548c\u90ae\u7bb1\uff0c\u8fd9\u4e24\u9879\u4fe1\u606f\u4f1a\u5728\u63d0\u4ea4\uff08commit\uff09\u64cd\u4f5c\u6267\u884c\u65f6\u7528\u5230\uff1a<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-pair-s\" spellcheck=\"false\"><code>git config --global user.name \"XXX\"<\/code><\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-pair-s\" spellcheck=\"false\"><code>git config --global user.email \"XXX@example.com\"<\/code><\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u8fd9\u4e9b\u8bbe\u7f6e\u4f1a\u88ab\u4fdd\u5b58\u5728 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>~\/.gitconfig<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u4e2d\uff0c\u6bcf\u4e00\u4e2a\u7cfb\u7edf\u7528\u6237\u53ef\u4ee5\u62e5\u6709\u4e00\u4efd\uff0c\u4f60\u53ef\u4ee5\u901a\u8fc7\u6267\u884c\u4e0b\u9762\u7684\u547d\u4ee4\u6765\u6253\u5f00\u5b83\uff0c\u5e76\u76f4\u63a5\u7f16\u8f91\uff1a<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-pair-s\" spellcheck=\"false\"><code>git config --global -e<\/code><\/span><span class=\"md-plain\"> \uff08e\u4ee3\u8868edit\uff0c<\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>-e<\/code><\/span><span class=\"md-plain\"> \u4e3a <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>--edit<\/code><\/span><span class=\"md-plain\"> \u7684\u522b\u540d\uff09<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u5728Win10\u7cfb\u7edf\u4e2d\uff0cglobal\u7248\u7684config\u6587\u4ef6\u5728 \uff08\u7cfb\u7edf\u76d8\uff09C:\\Users\\UserName \u76ee\u5f55\u4e0b\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u5982\u679c\u4f60\u60f3\u7ed9\u67d0\u4e2a\u4ed3\u5e93\u5355\u72ec\u8bbe\u7f6e\u7528\u6237\u540d\u4e0e\u90ae\u7bb1\uff0c\u53ea\u9700\u8981\u5728\u521b\u5efa\u597d\u4ed3\u5e93\u540e\uff0c\u6267\u884c\u4e0a\u65b9\u53bb\u6389 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>--global<\/code><\/span><span class=\"md-plain\"> \u7684\u547d\u4ee4\u6216\u8005\u5c06\u5176\u66ff\u6362\u4e3a <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>--local<\/code><\/span><span class=\"md-plain\">\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u9898\u5916\u8bdd\uff1agit\u7684config\u6587\u4ef6\u5206\u4e3a\u4e09\u79cd\uff0c\u7cfb\u7edf\u7ea7\u522b <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>--system<\/code><\/span><span class=\"md-plain\"> \uff0c\u5305\u542b\u7cfb\u7edf\u6240\u6709\u7528\u6237\u548c\u6240\u6709\u5e93\u7684\u503c\uff0c\u4fdd\u5b58\u5728\u5b89\u88c5\u8def\u5f84\u4e0b\u7684 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.\/etc\/gitconfig<\/code><\/span><span class=\"md-plain\">\uff1b\u7528\u6237\u7ea7\u522b <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>--global<\/code><\/span><span class=\"md-plain\"> \u5177\u4f53\u5230\u4f60\u7684\u8d26\u6237\uff1b\u4ee5\u53ca\u4ed3\u5e93\u7ea7\u522b <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>--local<\/code><\/span><span class=\"md-plain\"> \uff0c\u4f4d\u4e8e\u4ed3\u5e93\u76ee\u5f55\u4e0b\u7684 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.git<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u5939\u4e2d\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u8fd9\u4e00\u6b65\u7ed3\u675f\u524d\uff0c\u8fd8\u6709\u4e00\u4e9b\u989d\u5916\u7684\u7528\u6237\u8bbe\u7f6e\u503c\u5f97\u4f60\u65e5\u540e\u56de\u987e\uff1a<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-meta-i-c  md-link\"><a spellcheck=\"false\" href=\"https:\/\/git-scm.com\/book\/en\/v2\/Appendix-C%3A-Git-Commands-Setup-and-Config#_core_editor\" target=\"_blank\" rel=\"noopener\"><span class=\"md-plain\">default editor<\/span><\/a><\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-meta-i-c  md-link\"><a spellcheck=\"false\" href=\"https:\/\/git-scm.com\/book\/en\/v2\/Customizing-Git-Git-Configuration#_external_merge_tools\" target=\"_blank\" rel=\"noopener\"><span class=\"md-plain\">diff and merge tools<\/span><\/a><\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-meta-i-c  md-link\"><a spellcheck=\"false\" href=\"https:\/\/git-scm.com\/book\/en\/v2\/Git-Basics-Git-Aliases\" target=\"_blank\" rel=\"noopener\"><span class=\"md-plain\">command aliases<\/span><\/a><\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-meta-i-c  md-link\"><a spellcheck=\"false\" href=\"https:\/\/git-scm.com\/book\/en\/v2\/Customizing-Git-Git-Configuration\" target=\"_blank\" rel=\"noopener\"><span class=\"md-plain\">more<\/span><\/a><\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u4e3aGit\u914d\u7f6ePerforce P4Merge\uff08\u53ef\u9009\uff09<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\uff08summid\u6ce8\uff09\u9996\u5148\uff0c\u4ec0\u4e48\u662fP4Merge\uff1f\u5728P4Merge<\/span><span class=\"md-meta-i-c  md-link\"><a spellcheck=\"false\" href=\"https:\/\/www.perforce.com\/products\/helix-core-apps\/merge-diff-tool-p4merge\"><span class=\"md-plain\">\u5b98\u7f51<\/span><\/a><\/span><span class=\"md-plain\">\u6709\u4ecb\u7ecd\uff1aP4Merge tracks and compares the effects of past and pending work for branches and individual files. You can even use it to resolve conflicts (especially with <\/span><span class=\"md-meta-i-c  md-link\"><a spellcheck=\"false\" href=\"https:\/\/www.perforce.com\/blog\/vcs\/git-vs-perforce-how-choose-and-when-use-both\"><span class=\"md-plain\">Git<\/span><\/a><\/span><span class=\"md-plain\">). \u7b80\u5355\u6765\u8bf4\uff0c\u5b83\u662f\u4e00\u4e2a\u5e2e\u52a9\u6211\u4eec\u6bd4\u8f83\u4e24\u4e2a\u6587\u4ef6\u5dee\u5f02\u7684\u5de5\u5177\uff0c\u6700\u91cd\u8981\u7684\u662f\uff0c\u5b83\u662f\u56fe\u5f62\u5316\u4e14\u514d\u8d39\u7684\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u4e0b\u8f7d\u5b89\u88c5\u5b8cP4Merge\uff08\u5b89\u88c5\u65f6\u53ef\u9009\u62e9\u53ea\u5b89\u88c5Merge and Diff Tool\u7ec4\u4ef6\uff0c\u5b83\u624d\u662fP4Merge\u672c\u4f53\uff09\uff0c\u8981\u5728Git\u4e2d\u914d\u7f6e\u597dP4Merge\uff0c\u53ea\u9700\u8981\u5c06\u4e0b\u9762\u7684\u6587\u672c\u6dfb\u52a0\u5230 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitconfig<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u4e2d\u5373\u53ef\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>&#91;diff]\r\n    tool = p4merge\r\n&#91;difftool]\r\n    prompt = false\r\n&#91;difftool \"p4merge\"]\r\n    cmd = 'C:\/Program Files\/Perforce\/p4merge.exe' \\\"$REMOTE\\\" \\\"$LOCAL\\\"\r\n    prompt = false\r\n&#91;merge]\r\n    tool = p4merge\r\n&#91;mergetool]\r\n    keepBackup = false\r\n&#91;mergetool \"p4merge\"]\r\n    cmd = 'C:\/Program Files\/Perforce\/p4merge.exe' \\\"$BASE\\\" \\\"$REMOTE\\\" \\\"$LOCAL\\\" \\\"$MERGED\\\"\r\n    trustExitCode = true<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p\"><span class=\"md-plain md-expand\">\u9700\u8981\u5c06\u5176\u4e2dcmd\u8def\u5f84\u6362\u6210\u81ea\u5df1\u7684P4Merge\u5b89\u88c5\u8def\u5f84\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u8bbe\u7f6e\u5b8c\u6bd5\u540e\uff0c\u5728\u4ee5\u540e\u4f7f\u7528\u547d\u4ee4\u884c\u65f6\uff0c\u51e1\u662f <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>diff<\/code><\/span><span class=\"md-plain\"> \u547d\u4ee4\u90fd\u53ef\u4ee5\u7528 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>difftool<\/code><\/span><span class=\"md-plain\"> \u4ee3\u66ff\uff0c\u4ee5\u6253\u5f00\u56fe\u5f62\u5316\u754c\u9762\u6765\u6bd4\u8f83\u6587\u4ef6\u5dee\u5f02\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u4e3a Git \u914d\u7f6eUnityYAMLMerge \uff08\u53ef\u9009\uff09<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\uff08summid\u6ce8\uff09\u9996\u5148\uff0c\u4ec0\u4e48\u662fYAML\uff1fYAML\u5168\u79f0\u662f\u3010YAML Ain&#8217;t a Markup Language\u3011\uff0c\u7ffb\u8bd1\u8fc7\u6765\u662f\u3010YAML\u4e0d\u662f\u4e00\u79cd\u6807\u8bb0\u8bed\u8a00\u3011\u3002\u770b\u4e86\u5b83\u7684\u5168\u540d\uff0c\u5c31\u597d\u50cf\u770b\u4e86\u5168\u540d\u4e00\u6837\u3002\u4f46YAML\u8fd8\u6709\u53e6\u4e00\u4e2a\u540d\u5b57\uff0c\u3010Yet Another Markup Language\u3011\uff0c\u3010\u4ecd\u7136\u662f\u4e00\u79cd\u6807\u8bb0\u8bed\u8a00\u3011\uff0c\u4e4b\u6240\u4ee5\u6709\u4e24\u79cd\u5b8c\u5168\u76f8\u53cd\u7684\u610f\u601d\uff0c\u662f\u56e0\u4e3aYAML\u5b83\u5177\u6709\u6807\u8bb0\u8bed\u8a00\u7684\u7279\u70b9\u2014\u2014\u6bd4\u5982\u5b83\u53c2\u8003\u4e86XML\uff0c\u540c\u65f6\u5f3a\u8c03\u4ee5\u6570\u636e\u4e3a\u4e2d\u5fc3\u3002\u4f60\u53ef\u4ee5\u7406\u89e3\u4e3a\u7c7b\u4f3cXML\u3001JSON\u7b49\u8868\u8fbe\u6570\u636e\u5e8f\u5217\u5316\u7684\u683c\u5f0f\u3002Unity\u4e2d\u7684\u8d44\u6e90\u6587\u4ef6\u7684\u4fe1\u606f\uff0c\u90fd\u662f\u4ee5YAML\u683c\u5f0f\u4fdd\u5b58\u7684\uff08\u5305\u62ec <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.meta<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\uff09\uff0c\u5982\u679c\u4f60\u7528\u6587\u672c\u7f16\u8f91\u5668\u6253\u5f00\u5b83\u4eec\uff0c\u4f60\u5c31\u4f1a\u770b\u5230YAML\u672c\u5c0a\uff08\u524d\u63d0\u662f\u4f60\u4e4b\u524d\u5c06AssetSerialization\u9009\u9879\u8bbe\u7f6e\u4e3aForce Text\uff09\u3002\u5b9e\u9645\u4e0a\uff0c\u51e0\u4e4e\u6240\u6709\u8d44\u6e90\u6587\u4ef6\uff0c\u6bd4\u5982\u56fe\u7247\u3001\u89c6\u9891\u3001\u97f3\u9891\u3001\u9884\u5236\u4ef6\u3001\u5730\u5f62\u6587\u4ef6\u7b49\uff0c\u5b83\u4eec\u672c\u8d28\u90fd\u662f\u3010\u4e8c\u8fdb\u5236\u3011\u6587\u4ef6\uff0c\u60f3\u8981\u6bd4\u8f83\u3001\u5408\u5e76\u4e24\u4e2a\u3010\u4e8c\u8fdb\u5236\u3011\u6587\u4ef6\uff0c\u662f\u975e\u5e38\u56f0\u96be\u7684\uff0c\u5bf9\u4e8e\u8ba1\u7b97\u673a\u6765\u8bf4\u4e5f\u662f\u5982\u6b64\u3002\u4e3a\u6b64\uff0c\u6211\u4eec\u5c31\u9700\u8981 Git \u5728 YAML \u7684\u6307\u5bfc\u4e0b\u8fdb\u884c\u5408\u5e76\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">Unity\u81ea\u5e26\u6709\u5e2e\u52a9\u6211\u4eec\u5408\u5e76 Scene \u548c Prefab \u7684\u5de5\u5177\u2014\u2014UnityYAMLMerge\u3002\u8be5\u5de5\u5177\u5c31\u5728\u4f60UnityEditor\u5b89\u88c5\u76ee\u5f55\u4e0b\uff0c<\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>~\\Editor\\Data\\Tools\\UnityYAMLMerge.exe<\/code><\/span><span class=\"md-plain\"> \u3002\u7f8e\u4e2d\u4e0d\u8db3\u7684\u662f\uff0c\u5c3d\u7ba1\u7edd\u5927\u591a\u6570\u8d44\u6e90\u6587\u4ef6\u53ef\u4ee5\u88ab\u5e8f\u5217\u5316\u4e3aYAML\uff0c\u4f46\u5728\u5408\u5e76\u5de5\u4f5c\u5f00\u5c55\u65f6UnityYAMLMerge\u4e0d\u4f1a\u81ea\u52a8\u53c2\u4e0e\u8fdb\u6765\u2014\u2014\u9664\u975e\u4f60\u6307\u5b9a <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>force<\/code><\/span><span class=\"md-plain\"> \u6a21\u5f0f\u3002\u4e3a\u4e86\u5c06\u8be5\u5de5\u5177\u4e3a\u6211\u4eec\u6240\u7528\uff0c\u4e0b\u9762\u6211\u4eec\u5f00\u59cb\u914d\u7f6e\u5b83\u3002<\/span><\/p>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain\">\u6211\u4eec\u9700\u8981\u5728 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitconfig<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u4e2d\u589e\u52a0\u4e00\u6761\u65b0\u7684 \u3010merge tool\u3011 \u6761\u76ee\uff0c\u4e3a\u4e86\u66f4\u65b9\u4fbf\u4f7f\u7528\uff0c\u6211\u4eec\u8fd8\u5c06\u5b83\u8bbe\u7f6e\u4e3a Git \u7684\u9ed8\u8ba4\u5408\u5e76\u5de5\u5177\u3002\u7528\u4e0b\u9762\u7684\u6587\u672c\u66ff\u6362\u4e0a\u4e00\u8282\u4e2d\u7684\u5408\u5e76\u5de5\u5177\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>&#91;merge]\r\n    tool = unityyamlmerge\r\n    \r\n&#91;mergetool \"unityyamlmerge\"]\r\n    trustExitCode = false\r\n    keepBackup = false\r\n    cmd = 'C:\/Program Files\/Unity\/Editor\/Data\/Tools\/UnityYAMLMerge.exe' merge -p \\\"$BASE\\\" \\\"$REMOTE\\\" \\\"$LOCAL\\\" \\\"$MERGED\\\"<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p\"><span class=\"md-plain md-expand\">\u6ce8\u610f\u4f60\u9700\u8981\u5c06 cmd \u8def\u5f84\u66ff\u6362\u4e3a\u81ea\u5df1\u4f7f\u7528\u7684UnityEditor\u8def\u5f84\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\uff08summid\u6ce8\uff09\u4f60\u4f1a\u53d1\u73b0\uff0c\u56e0\u4e3a\u6211\u4eec\u662f\u5728 global config \u6587\u4ef6\u4e2d\u914d\u7f6e\u7684\u5408\u5e76\u5de5\u5177\uff0c\u610f\u5473\u7740\u6bcf\u5f53\u6211\u4eec\u5728\u4e0d\u540cUnity\u7248\u672c\u4e4b\u95f4\u5207\u6362\u65f6\uff0c\u5c31\u9762\u4e34\u662f\u5426\u9700\u8981\u4fee\u6539\u914d\u7f6e\u7684\u6289\u62e9\u2014\u2014\u4e07\u4e00\u51fa\u73b0\u95ee\u9898\u4e86\u5462\u3002summid \u8fd9\u91cc\u5efa\u8bae\u5c06\u8be5\u914d\u7f6e\u653e\u8fdb local config \u6587\u4ef6\u4e2d\uff0c\u6bd5\u7adf\u4e00\u4e2a\u9879\u76ee\u5bf9\u5e94\u4e00\u4e2aUnity\u7248\u672c\uff0c\u8fd9\u6837\u5c31\u514d\u53bb\u4e86\u4fee\u6539 global config \u7684\u9ebb\u70e6\uff0c\u574f\u5904\u662f\u6bcf\u5f00\u4e00\u4e2a\u65b0\u9879\u76ee\u90fd\u9700\u8981\u914d\u7f6e\u4e00\u6b21\u3002git \u4f1a\u4f18\u5148\u6ee1\u8db3\u4ed3\u5e93\u7684\u914d\u7f6e\u6587\u4ef6\uff0c\u5f53\u4ed3\u5e93\u6587\u4ef6\u4e2d\u4e0d\u5b58\u5728 key \u65f6\uff0c\u624d\u4f1a\u53bb\u66f4\u9ad8\u7ea7\u7684\u914d\u7f6e\u6587\u4ef6\u4e2d\u5bfb\u627e\uff0c\u8fd9\u6837\u4e5f\u4e0d\u7528\u62c5\u5fc3\u5b83\u4f1a\u8986\u76d6\u6389 global config \u4e2d\u7684\u914d\u7f6e\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u5728 merge \u573a\u666f\u6216\u9884\u5236\u4ef6\u9047\u5230\u51b2\u7a81\u65f6\uff0c <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>git mergetool<\/code><\/span><span class=\"md-plain\"> \u4f1a\u81ea\u52a8\u5c1d\u8bd5\u7528 UnityYAMLMerge \u6765\u89e3\u51b3\u51b2\u7a81\u3002\u5f53\u51b2\u7a81\u6ca1\u80fd\u6210\u529f\u89e3\u51b3\u65f6\uff0c\u4f1a\u6267\u884c\u3010\u56de\u9000\u64cd\u4f5c\uff08fallback\uff09\u3011\uff0c\u56de\u9000\u64cd\u4f5c\u6240\u91c7\u7528\u7684\u5de5\u5177\u4f1a\u8bb0\u5f55\u5728\u4e0e UnityYAMLMerge \u540c\u4e00\u76ee\u5f55\u4e0b\u7684 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>mergespecfile.txt<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u91cc\u3002\u8be5\u6587\u4ef6\u91cc\u81ea\u5e26\u4e86\u4e00\u4e9b merge \u5de5\u5177\uff08\u5305\u62ecP4Merge\uff09\uff0c\u5e76\u4e14\u6392\u5728\u524d\u9762\u7684\u5de5\u5177\u4f1a\u88ab\u4f18\u5148\u91c7\u7528\u3002\u4f60\u53ef\u4ee5\u7f16\u8f91\u8fd9\u4e2a\u6587\u4ef6\u6765\u81ea\u5b9a\u4e49 fallback \u5de5\u5177\uff0c\u4f46\u6ce8\u610f\u5f53\u5b89\u88c5\u4e86\u65b0 Unity \u540e\u8fd9\u4e2a\u6587\u4ef6\u5c06\u88ab\u7cfb\u7edf\u4fee\u6539\u3002<\/span><\/p>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain\">\u4e00\u822c\u6765\u8bf4\uff0c Git \u4f1a\u5728\u68c0\u6d4b\u51b2\u7a81\u65f6\uff08 pull \u548c merge \u547d\u4ee4\uff09\u7528 UnityYAMLMerge \u6765\u9632\u6b62\u5c55\u793a\u4e0d\u5b58\u5728\uff08not truly exist\uff09\u7684\u51b2\u7a81\u3002\u4f8b\u5982\uff0c\u4e00\u4e2a\u5c5e\u6027\u53ea\u662f\u88ab\u7b80\u5355\u5730\u6539\u53d8\u4e86\u4f4d\u7f6e\uff0c\u4f46\u5b83\u7684\u503c\u662f\u6ca1\u6709\u53d8\u5316\u7684\uff08For example, say a property was simply moved around, but its value was unchanged. \uff09\u3002\u5e76\u4e14 Git \u7684 merge \u7b97\u6cd5\u4e5f\u4f1a\u5ffd\u7565\u4e00\u4e9b\u771f\u6b63\u7684\u51b2\u7a81\uff0c\u5373\u4f7f\u53ef\u80fd\u6027\u975e\u5e38\u5c0f\u3002\u4e3a\u4e86\u53d1\u73b0\u8fd9\u4e9b\u60c5\u51b5\uff0c\u6211\u4eec\u53ef\u4ee5\u5728 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitattributes<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u91cc\u81ea\u5b9a\u4e49\u4e00\u4e2a \u3010merge driver\u3011\uff0c\u5e76\u6307\u5b9a\u54ea\u4e9b\u6587\u4ef6\u9700\u8981\u7528\u5230\u5b83\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>&#91;merge \"unityyamlmerge\"]\r\n     name = UnityYAMLMerge\r\n     driver = 'C:\/Program Files\/Unity\/Editor\/Data\/Tools\/UnityYAMLMerge.exe' merge --force --fallback none %O %B %A %P<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain md-expand\">\u6211\u4eec\u4f1a\u5728\u7a0d\u540e\u8ba8\u8bba <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitattributes<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u8fd9\u91cc\u542f\u7528 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>force<\/code><\/span><span class=\"md-plain\"> \u9009\u9879\u7684\u539f\u56e0\u662f\uff0cGit \u5728\u5408\u5e76\u65f6\u5bf9\u4e00\u4e2a\u6587\u4ef6\u7684\u4e0d\u540c\u7248\u672c\u91c7\u7528\u5b8c\u5168\u968f\u673a\u7684\u547d\u540d\u65b9\u5f0f\uff0c\u5e76\u4e14 UnityYAMLMerge \u4e0d\u91c7\u7528\u3010destination\u3011\u53c2\u6570\u6765\u68c0\u6d4b\u6587\u4ef6\u7c7b\u578b\u3002\u9700\u8981\u6ce8\u610f\u7684\u662f\u5f53\u524d\u6211\u8fd8\u5728\u5c1d\u8bd5\u4f7f\u7528\u8be5 merge driver\uff0c\u5b83\u53ef\u80fd\u65e0\u6cd5\u4e0e\u9664 P4Merge \u4ee5\u5916\u7684\u5408\u5e76\u5de5\u5177\u4f7f\u7528\u3002\uff08\u6dfb\u52a0 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>describe<\/code><\/span><span class=\"md-plain\"> \u9009\u9879\u53ef\u4ee5\u5728 UnityYAMLMerge \u68c0\u6d4b\u5230\u51b2\u7a81\u65f6\u5c06\u5176\u8f93\u51fa\u51fa\u6765\uff09<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u6700\u540e\uff0c\u4e0a\u9762\u7684 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>cmd<\/code><\/span><span class=\"md-plain\"> \u548c <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>driver<\/code><\/span><span class=\"md-plain\"> \u503c\u9700\u8981\u6307\u5b9a\u4e3a\u4f60\u81ea\u5df1\u7684\u8def\u5f84\u3002\u914d\u7f6e\u8fd9\u4e9b\u8def\u5f84\u770b\u8d77\u6765\u975e\u5e38\u9ebb\u70e6\uff0c\u5c24\u5176\u662f\u5728\u4f7f\u7528 Unity Hub \u65f6\uff0c\u56e0\u4e3a\u8fd9\u4e9b\u8def\u5f84\u4f1a\u6839\u636e\u4f60\u4f7f\u7528\u7684 Unity \u7248\u672c\u53d8\u5316\u800c\u53d8\u5316\uff0c\u4f46\u76ee\u524d\u8fd8\u6ca1\u6709\u5f88\u597d\u7684\u89e3\u51b3\u529e\u6cd5\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u521b\u5efa Git \u4ed3\u5e93<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u63a5\u4e0b\u6765\u4e3a Unity \u5de5\u7a0b\u521b\u5efa\u4e00\u4e2a\u65b0 Git \u4ed3\u5e93\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>cd \/c\/Projects\/MyUnityProject\r\ngit init .<\/code><\/pre>\n\n\n<p><span class=\"md-plain md-expand\">\u6267\u884c\u4e0a\u9762\u7684\u547d\u4ee4\u540e\uff0c\u4f1a\u521b\u5efa\u65b0 Git \u4ed3\u5e93\u548c\u4e00\u4e2a <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.git\/<\/code><\/span><span class=\"md-plain\"> \u76ee\u5f55\uff0c\u5e76\u4e14\u7cfb\u7edf\u5c06\u8f93\u51fa\u4e0b\u9762\u7684\u5185\u5bb9\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>Initialized empty Git repository in C:\/Projects\/MyUnityProject\/.git\/<\/code><\/pre>\n\n\n<p><span class=\"md-plain md-expand\">\u6211\u4eec\u53ef\u4ee5\u7528 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>status<\/code><\/span><span class=\"md-plain md-expand\"> \u547d\u4ee4\u6765\u786e\u8ba4\u5f53\u524d\u4ed3\u5e93\u7684\u72b6\u6001\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git status -s<\/code><\/pre>\n\n\n<p>\u7136\u540e\u7cfb\u7edf\u4f1a\u8f93\u51fa\u7c7b\u4f3c\u4e0b\u9762\u7684\u5185\u5bb9\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>?? .vs\/\r\n?? Assembly-CSharp-Editor.csproj\r\n?? Assembly-CSharp.csproj\r\n?? Assets\/\r\n?? Library\/\r\n?? Logs\/\r\n?? MyUnityProject.sln\r\n?? Packages\/\r\n?? ProjectSettings\/\r\n?? Temp\/\r\n?? obj\/<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p\"><span class=\"md-pair-s md-expand\" spellcheck=\"false\"><code>??<\/code><\/span><span class=\"md-plain\"> \u8868\u793a\u8be5\u6587\u4ef6\u6216\u76ee\u5f55\u88ab Git \u68c0\u6d4b\u5230\uff0c\u4f46\u8fd8\u6ca1\u6709\u7eb3\u5165\u7248\u672c\u7ba1\u7406\uff0c\u5373\u8fd8\u6ca1\u6709\u63d0\u4ea4\u8fc7\u3002\u5728\u63d0\u4ea4\u6587\u4ef6\u524d\uff0c\u6211\u4eec\u9700\u8981\u8ba9 Git \u5ffd\u7565\u4e00\u4e9b\u4e0d\u7528\u63d0\u4ea4\u7684\u6587\u4ef6\u548c\u76ee\u5f55\uff0c\u4f8b\u5982\u4e34\u65f6\u6587\u4ef6\u6216 Unity \u53ef\u4ee5\u91cd\u65b0\u751f\u6210\u7684\u6587\u4ef6\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u6dfb\u52a0\u5ffd\u7565\u6587\u4ef6\u548c\u5ffd\u7565\u76ee\u5f55\uff08.gitignore\uff09\uff08\u5fc5\u8981\uff09<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u8981\u5ffd\u7565\u67d0\u4e9b\u6587\u4ef6\u6216\u76ee\u5f55\uff0c\u6211\u4eec\u9700\u8981\u5728\u9879\u76ee\u6839\u76ee\u5f55\u521b\u5efa <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitignore<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\uff0c\u5e76\u5c06\u9700\u8981\u5ffd\u7565\u7684\u6587\u4ef6\u3001\u76ee\u5f55\u6dfb\u52a0\u8fdb\u53bb\u3002\uff08summid \u6ce8\uff09\u5728\u9879\u76ee\u6839\u76ee\u5f55\u521b\u5efa\u4e0d\u662f\u5fc5\u987b\u7684\uff0c\u4f60\u53ef\u4ee5\u5728\u4ed3\u5e93\u76ee\u5f55\u4e0b\u5176\u4ed6\u4f4d\u7f6e\u521b\u5efa\u5b83\uff0c\u5c06\u5b83\u653e\u5728\u6839\u76ee\u5f55\u4e0b\u53ea\u662f\u6bd4\u8f83\u901a\u7528\u548c\u65b9\u4fbf\u7684\u505a\u6cd5\uff0c\u4f46\u4f60\u53ef\u4ee5\u6839\u636e\u5b9e\u9645\u60c5\u51b5\u8fdb\u884c\u8c03\u6574\uff0c\u4f8b\u5982\u4f60\u7684<\/span><span class=\"md-pair-s \"><strong><span class=\"md-plain\">\u4ed3\u5e93\u6839\u76ee\u5f55<\/span><\/strong><\/span><span class=\"md-plain\">\u4e0e<\/span><span class=\"md-pair-s \"><strong><span class=\"md-plain\">\u9879\u76ee\u6839\u76ee\u5f55<\/span><\/strong><\/span><span class=\"md-plain\">\u5e76\u4e0d\u662f\u4e00\u81f4\u7684\uff0c\u9879\u76ee\u6839\u76ee\u5f55\u53ef\u80fd\u5728\u4ed3\u5e93\u6839\u76ee\u5f55\u7684\u5b50\u76ee\u5f55\u4e0b\uff0c\u56e0\u4e3a\u4f60\u53ef\u80fd\u60f3\u8981\u5728\u4ed3\u5e93\u6839\u76ee\u5f55\u4e0b\u5b58\u653eUnity\u9879\u76ee\u4ee5\u5916\u7684\u5176\u4ed6\u6587\u4ef6\uff08\u9879\u76ee\u6587\u6863\u3001\u914d\u7f6e\u8868\u7b49\uff09\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitignore<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u7684\u5185\u5bb9\u53ef\u80fd\u4f1a\u6bd4\u8f83\u591a\uff0c\u4f46\u5df2\u7ecf\u6709\u8bb8\u591a\u6a21\u677f\u4f9b\u6211\u4eec\u9009\u62e9\uff0c <\/span><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/github.com\/github\/gitignore\"><span class=\"md-plain\">GitHub\u4e0a\u5c31\u6709\u7c7b\u4f3c\u7684\u4ed3\u5e93<\/span><\/a><\/span><span class=\"md-plain\">\uff0c\u5176\u4e2d\u8bb0\u5f55\u4e86\u5927\u591a\u6570\u9879\u76ee\u7684\u5ffd\u7565\u914d\u7f6e\u6587\u4ef6\u6a21\u677f\uff0c\u5305\u62ecUnity\u9879\u76ee\u3002\u4f60\u53ef\u4ee5\u5728\u6a21\u677f\u7684\u57fa\u7840\u4e0a\u6dfb\u52a0\u81ea\u5df1\u7684\u5ffd\u7565\u89c4\u5219\uff0c\u5176\u8bed\u6cd5\u53ef\u4ee5\u5728 <\/span><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/git-scm.com\/docs\/gitignore\"><span class=\"md-plain\">git\u5b98\u65b9\u6587\u6863<\/span><\/a><\/span><span class=\"md-plain\">\u4e2d\u67e5\u8be2\u3002<\/span><\/p>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain\">\u4e00\u65e6\u6211\u4eec\u914d\u7f6e\u597d\u4e86 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitignore<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\uff0c\u518d\u6b21\u6267\u884c\u4e0b\u9762\u7684\u547d\u4ee4\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git status -s<\/code><\/pre>\n\n\n<p>\u4e4b\u540e\u5c06\u663e\u793a\u5e94\u8be5\u88ab\u7eb3\u5165\u7248\u672c\u7ba1\u7406\u7684\u6587\u4ef6\uff08\u76ee\u5f55\uff09\uff0c\u9664\u6b64\u4ee5\u5916\u7684\u6587\u4ef6\u90fd\u662f\u6ca1\u5fc5\u8981\u540c\u6b65\u7684\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>?? .gitignore\r\n?? Assets\/\r\n?? Packages\/\r\n?? ProjectSettings\/<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p\"><span class=\"md-plain md-expand\">\u9700\u8981\u6ce8\u610f\u7684\u662f\uff0c<\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitignore<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u4e5f\u9700\u8981\u88ab\u540c\u6b65\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u521d\u59cb\u5316 Git LFS \uff08\u5efa\u8bae\uff09<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">Git \u4ed3\u5e93\u901a\u5e38\u5305\u542b\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u8bb0\u5f55\u3002\u7531\u4e8e\u4e8c\u8fdb\u5236\u6587\u4ef6\u65e0\u6cd5\u6839\u636e\u5176\u589e\u91cf\uff08\u5dee\u5f02\uff09\u8f7b\u677e\u5b58\u50a8\uff0c\u56e0\u6b64\u5c06\u58f0\u97f3\u3001\u7eb9\u7406\u6587\u4ef6\u7b49\u6e38\u620f\u8d44\u6e90\u6dfb\u52a0\u5230\u4ed3\u5e93\u53ef\u80fd\u4f1a\u968f\u7740\u65f6\u95f4\u7684\u63a8\u79fb\u5bfc\u81f4\u6027\u80fd\u95ee\u9898\uff0c\u5c24\u5176\u662f\u5728\u514b\u9686\u4ed3\u5e93\u526f\u672c\u65f6\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/git-lfs.github.com\/\"><span class=\"md-plain\">Git Large File Storage\uff08LFS\uff09<\/span><\/a><\/span><span class=\"md-plain\">\u6269\u5c55\u7684\u51fa\u73b0\u5c31\u662f\u4e3a\u4e86\u89e3\u51b3\u8be5\u95ee\u9898\u3002\u5b83\u7684\u5de5\u4f5c\u539f\u7406\u662f\u5c06\u5c0f\u6587\u4ef6\u4fdd\u5b58\u5728\u4ed3\u5e93\u4e2d\uff0c\u8fd9\u4e9b\u5c0f\u6587\u4ef6\u4ec5\u6307\u5411\u4ed3\u5e93\u5916\u90e8\u7684<\/span><span class=\"md-pair-s \"><strong><span class=\"md-plain\">\u5b9e\u9645<\/span><\/strong><\/span><span class=\"md-plain\">\u6587\u4ef6\u3002\u81f3\u4e8e\u54ea\u4e9b\u6587\u4ef6\u7684\u5b58\u50a8\u5de5\u4f5c\u4ee5\u8fd9\u79cd\u65b9\u5f0f\u8fdb\u884c\uff0c\u51b3\u5b9a\u4e8e\u6211\u4eec\u6307\u5b9a\u4e86\u54ea\u4e9b\u6587\u4ef6\u7c7b\u578b\u4e3a\u5927\u6587\u4ef6\u7c7b\u578b\uff08large file type\uff09\u3002\u5728\u4f7f\u7528\u666e\u901a Git \u547d\u4ee4\u65f6\uff0c\u4f1a\u6839\u636e\u9700\u8981\u4f20\u8f93\u5927\u578b\u6587\u4ef6\u3002\u4f7f\u7528 LFS \u7684\u7f3a\u70b9\u662f\u9700\u8981\u8fdc\u7a0b\u4ed3\u5e93\u652f\u6301\u8be5\u7279\u6027\uff0c\u6bd4\u5982 GitHub\u3001Azure DevOps \u6216 Gitea<\/span><\/p>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain\">LFS \u7279\u6027\u5df2\u7ecf\u5305\u542b\u5728 Git \u547d\u4ee4\u884c\u5ba2\u6237\u7aef\u548c\u8bb8\u591a GUI \u5ba2\u6237\u7aef\u91cc\uff0c\u4f46\u5728\u65b0\u4ed3\u5e93\u4e2d\u8fd8\u662f\u8981\u901a\u8fc7\u4e00\u4e9b\u6b65\u9aa4\u6765\u542f\u7528\u5b83\u3002\u7b2c\u4e00\u6b65\uff0c\u521d\u59cb\u5316 Git LFS\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git lfs install<\/code><\/pre>\n\n\n<p>\u8fd9\u6761\u547d\u4ee4\u53ea\u9700\u8981\u88ab\u6267\u884c\u4e00\u6b21\uff0c\u4e4b\u540e\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u514b\u9686\u7684\u7528\u6237\u4e0d\u9700\u8981\u518d\u6267\u884c\u5b83\uff08\u5b98\u65b9\u6587\u6863\u4e2d\u6ce8\u91ca\uff1aYou only need to run this once per user account.\uff09\u3002\u5982\u679c LFS \u88ab\u6210\u529f\u521d\u59cb\u5316\uff0c\u4f1a\u8f93\u51fa\u4e0b\u9762\u7684\u5185\u5bb9\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>Updated git hooks.\r\nGit LFS initialized.<\/code><\/pre>\n\n\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain md-expand\">\u914d\u7f6e Git LFS \uff08.gitattributes\uff09\uff08\u5efa\u8bae\uff09<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u4e0b\u4e00\u4e2a\u975e\u5e38\u91cd\u8981\u7684\u6b65\u9aa4\u662f\u6307\u5b9a\u90a3\u4e9b\u6587\u4ef6\u5e94\u8be5\u88ab Git LFS \u6240\u7ba1\u7406\u3002\u8fd9\u4e00\u6b65\u53ef\u901a\u8fc7 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>git lfs track<\/code><\/span><span class=\"md-plain\"> \u547d\u4ee4\u6765\u5b8c\u6210\uff0c\u4f46\u5f53\u8fd9\u91cc\u6709\u975e\u5e38\u591a\u7684\u6587\u4ef6\u7c7b\u578b\u9700\u8981\u914d\u7f6e\u65f6\uff0c\u76f4\u63a5\u7f16\u8f91 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitattributes<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u4f1a\u66f4\u65b9\u4fbf\u3002<\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitarrtibutes<\/code><\/span><span class=\"md-plain\"> \u8fd8\u7528\u4e8e\u6307\u5b9a Git \u5e94\u5982\u4f55\u5904\u7406\u6587\u4ef6\u7c7b\u578b\u7684\u884c\u5c3e\uff0c\u4ee5\u53ca\u6267\u884c\u5408\u5e76\u548c\u6bd4\u8f83\u5dee\u5f02\u7684\u65b9\u6cd5\u3002\u66f4\u591a\u4fe1\u606f\u53ef\u4ee5\u5728<\/span><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/git-scm.com\/docs\/gitattributes\"><span class=\"md-plain\">\u5b98\u65b9\u6587\u6863<\/span><\/a><\/span><span class=\"md-plain\">\u4e2d\u627e\u5230\u3002<\/span><\/p>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain\">\u8fd9\u4e2a\u6587\u4ef6\u7684\u5185\u5bb9\u540c\u6837\u4f1a\u6bd4\u8f83\u591a\uff0c\u8fd9\u91cc\u6709<\/span><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/hextantstudios.com\/unity-gitattributes\/\"><span class=\"md-plain\">\u539f\u4f5c\u8005\u7684 .gitattributes \u6587\u4ef6\u6a21\u677f<\/span><\/a><\/span><span class=\"md-plain\">\u3002\u6211\u4f1a\u4ecb\u7ecd\u4e00\u4e9b\u91cd\u8981\u7684\u90e8\u5206\uff0c\u9996\u5148\u4ece\u4e00\u4e9b\u5b8f\u5f00\u59cb\uff0c\u5b83\u4f1a\u8ba9\u540e\u9762\u7684\u9605\u8bfb\u548c\u7f16\u8f91\u66f4\u6e05\u6670\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code># Macro for Unity YAML-based asset files.\r\n&#91;attr]unityyaml -text merge=unityyamlmerge diff\r\n\r\n# Macro for all binary files that should use Git LFS.\r\n&#91;attr]lfs -text filter=lfs diff=lfs merge=lfs<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p\"><span class=\"md-pair-s md-expand\" spellcheck=\"false\"><code>unityyaml<\/code><\/span><span class=\"md-plain\"> \u5b8f\u7528\u4e8e\u88ab Unity \u521b\u5efa\u7684\u8d44\u6e90\uff0c\u8fd9\u4e9b\u8d44\u6e90\u7528\u7684\u662f YAML \u683c\u5f0f\u3002<\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>-text<\/code><\/span><span class=\"md-plain\"> \u9009\u9879\u662f\u4e3a\u4e86\u9632\u6b62 Git \u5728\u4e0d\u540c\u5e73\u53f0\u4e0a\u81ea\u52a8\u8f6c\u6362\u8fd9\u4e9b\u6587\u4ef6\u7684\u6362\u884c\u7b26\uff0c\u8fd9\u53ef\u80fd\u4f1a\u5bfc\u81f4\u4e00\u4e9b\u95ee\u9898\u3002<\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>merge=unityyamlmerge<\/code><\/span><span class=\"md-plain\"> \u9009\u9879\u6307\u793a Git \u5728\u5408\u5e76\u65f6\u91c7\u7528\u4e4b\u524d\u5728 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitconfig<\/code><\/span><span class=\"md-plain\"> \u4e2d\u8bbe\u7f6e\u7684 unityyamlmerge \u5de5\u5177\u3002\u6700\u540e\uff0c<\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>diff<\/code><\/span><span class=\"md-plain\"> \u9009\u9879\u6307\u793a Git \u59cb\u7ec8\u6267\u884c\u6587\u672c\u7684\u5dee\u5f02\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-pair-s\" spellcheck=\"false\"><code>lfs<\/code><\/span><span class=\"md-plain\"> \u5b8f\u7528\u4e8e\u6240\u6709\u4e8c\u8fdb\u5236\u8d44\u6e90\u6587\u4ef6\uff08\u5305\u62ec Unity \u521b\u5efa\u7684\uff09\u3002\u5b8f\u540e\u9762\u7684\u9009\u9879\u53c2\u6570\u6307\u793a Git \u7528 LFS \u6765\u7ba1\u7406\u8fd9\u4e9b\u6587\u4ef6\u3002<\/span><\/p>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain\">\u4e0b\u9762\u7684\u4e3b\u8981\u90e8\u5206\u6307\u5b9a\u6240\u6709\u57fa\u4e8e Unity YAML \u7684\u8d44\u6e90\u6587\u4ef6\u91c7\u7528 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>unityyaml<\/code><\/span><span class=\"md-plain\"> \u5b8f\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>...\r\n# Unity Text Assets\r\n*.meta unityyaml\r\n*.unity unityyaml\r\n*.asset unityyaml\r\n*.prefab unityyaml\r\n...<\/code><\/pre>\n\n\n<p><span class=\"md-plain md-expand\">\u4e0b\u9762\u90e8\u5206\u6307\u5b9a\u4e00\u4e9b Unity \u521b\u5efa\u7684\u4e8c\u8fdb\u5236\u6587\u4ef6\u91c7\u7528 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>lfs<\/code><\/span><span class=\"md-plain md-expand\"> \u5b8f\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>...\r\n# Unity Binary Assets\r\n*.cubemap lfs\r\n*.unitypackage lfs\r\n# Note: Unity terrain assets must have \"-Terrain\" suffix.\r\n*-&#91;Tt]errain.asset -unityyaml lfs\r\n# Note: Unity navmesh assets must have \"-NavMesh\" suffix.\r\n*-&#91;Nn]av&#91;Mm]esh.asset -unityyaml lfs\r\n...<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u56e0\u4e3a terrain \u548c navmesh \u6ca1\u6709\u81ea\u5df1\u7684\u6269\u5c55\u540d\uff0c\u6240\u4ee5\u7528\u6587\u4ef6\u540d\u540e\u7f00\u6765\u533a\u522b\u5b83\u4eec\u548c .asset \u6587\u4ef6\u3002\u5728\u547d\u540d\u5b83\u4fe9\u7684\u65f6\u5019\u8bb0\u5f97\u5339\u914d\u547d\u540d\u89c4\u5219\u3002\u7406\u60f3\u60c5\u51b5\u4e0b\uff0cUnity \u4f1a\u7ed9\u5b83\u4eec\u91c7\u7528\u72ec\u7279\u7684\u6587\u4ef6\u6269\u5c55\u540d\uff0c\u56e0\u4e3a\u5b83\u4eec\u4f3c\u4e4e\u8fdd\u53cd\u4e86\u6211\u4eec\u4e4b\u524d\u8bbe\u7f6e\u7684 Asset Serialization Mode \u9009\u9879\u3002\u5bf9\u4e8e\u5df2\u7ecf\u5b58\u5728\u8fd9\u4e9b\u8d44\u6e90\u7684\u9879\u76ee\uff0c\u5728\u63d0\u4ea4\u524d\u5e94\u8be5\u91cd\u547d\u540d\u5b83\u4eec\u6216\u4fee\u6539\u914d\u7f6e\u6587\u4ef6\u4e2d\u7684\u5339\u914d\u89c4\u5219\u3002<\/span><\/p>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain md-expand\">\u6700\u540e\u5269\u4e0b\u7684\u90e8\u5206\u662f\u975e\u5e38\u591a\u7684\u4e8c\u8fdb\u5236\u6587\u4ef6\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>...\r\n# Image\r\n*.jpg lfs\r\n*.jpeg lfs\r\n*.png lfs\r\n...\r\n# Audio\r\n*.mp3 lfs\r\n*.ogg lfs\r\n*.wav lfs\r\n...<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain md-expand\">\u53ef\u4ee5\u6839\u636e\u9700\u8981\u5411\u91cc\u6dfb\u52a0\u65b0\u7684\u6587\u4ef6\u7c7b\u578b\uff0c\u4f46\u6ce8\u610f\u6dfb\u52a0\u524d\u6ca1\u6709\u65b0\u6587\u4ef6\u5728\u6682\u5b58\u533a\u91cc\u3002\u5982\u679c\u4f60\u54ea\u4e2a\u90e8\u5206\u8bbe\u7f6e\u51fa\u9519\uff0c\u5e76\u4e14\u5411\u4ed3\u5e93\u63d0\u4ea4\u4e86\u4e8c\u8fdb\u5236\u6587\u4ef6\uff0c\u4f60\u53ef\u4ee5\u7528 <\/span><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/github.com\/git-lfs\/git-lfs\/wiki\/Tutorial#migrating-existing-repository-data-to-lfs\"><span class=\"md-plain\">migrate \u547d\u4ee4<\/span><\/a><\/span><span class=\"md-plain\">\u628a\u5b83\u4ea4\u7ed9 LFS\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u4f60\u53ef\u4ee5\u68c0\u67e5\u7279\u5b9a\u6587\u4ef6\u88ab\u8bbe\u7f6e\u4e86\u54ea\u4e9b\u7279\u6027\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git check-attr -a Assets\/Town-Outside-NavMesh.asset<\/code><\/pre>\n\n\n<p>\u6309\u4e0a\u9762\u7684\u914d\u7f6e\u6765\uff0c\u4f1a\u8f93\u51fa\u54ea\u4e9b\u90e8\u5206\u7528\u4e8e LFS\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>Assets\/Town-Outside-NavMesh.asset: diff: lfs\r\nAssets\/Town-Outside-NavMesh.asset: merge: lfs\r\nAssets\/Town-Outside-NavMesh.asset: text: unset\r\nAssets\/Town-Outside-NavMesh.asset: unityyaml: unset\r\nAssets\/Town-Outside-NavMesh.asset: lfs: set\r\nAssets\/Town-Outside-NavMesh.asset: filter: lfs<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain\">\u548c <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitignore<\/code><\/span><span class=\"md-plain md-expand\"> \u6587\u4ef6\u4e00\u6837\uff0cGitHub \u4e0a\u4e5f\u6709\u6536\u96c6 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitattribute<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u6a21\u677f\u7684<\/span><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/github.com\/alexkaratarakis\/gitattributes\"><span class=\"md-plain\">\u4ed3\u5e93<\/span><\/a><\/span><span class=\"md-plain\">\uff0c\u4f60\u53ef\u4ee5\u6839\u636e\u6a21\u677f\u4fee\u6539\u4e3a\u81ea\u5df1\u7684\u7248\u672c\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u5411\u4ed3\u5e93\u63d0\u4ea4\u6587\u4ef6<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u521d\u59cb\u914d\u7f6e\u7ec8\u4e8e\u5b8c\u6210\u4e86\uff0c\u63a5\u4e0b\u6765\u5f00\u59cb\u63d0\u4ea4\u6587\u4ef6\u5230\u4ed3\u5e93\u91cc\u3002\u6211\u559c\u6b22\u5728\u7b2c\u4e00\u6b21\u63d0\u4ea4\u4e2d\u68c0\u5165 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitignore<\/code><\/span><span class=\"md-plain\"> \u548c <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitattribute<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u3002\u9996\u5148\uff0c\u6211\u4eec\u9700\u8981\u5c06\u5b83\u4eec\u653e\u5165 Git \u7684\u6587\u4ef6\u6682\u5b58\u533a\u91cc\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git add .gitignore\r\ngit add .gitattributes<\/code><\/pre>\n\n\n<p>\u7136\u540e\u68c0\u67e5\u4e0b\u4ed3\u5e93\u72b6\u6001\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>git status -s<\/code><\/pre>\n\n\n<p>Git \u4f1a\u8f93\u51fa\u7c7b\u4f3c\u4e0b\u9762\u7684\u5185\u5bb9\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>A  .gitattributes\r\nA  .gitignore\r\n?? Assets\/\r\n?? Packages\/\r\n?? ProjectSettings\/<\/code><\/pre>\n\n\n<p><span class=\"md-plain md-expand\">\u4fe9\u914d\u7f6e\u6587\u4ef6\u524d\u9762\u7684 A \u6807\u81f4\u8868\u793a\u5b83\u4eec\u5df2\u7ecf\u5b58\u5165\u4e86\u6682\u5b58\u533a\u3002\u6682\u5b58\u533a\u8bb0\u5f55\u4e86\u65b0\u7684\u6216\u6709\u6539\u52a8\u7684\u6587\u4ef6\uff0c\u5728\u4f60\u6267\u884c <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>commit<\/code><\/span><span class=\"md-plain md-expand\"> \u547d\u4ee4\u540e\uff0c\u6682\u5b58\u533a\u7684\u6539\u52a8\u5c06\u88ab\u63d0\u4ea4\u5230\u4ed3\u5e93\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git commit -m \"Added .gitignore and .gitattributes\"<\/code><\/pre>\n\n\n<p>\u63d0\u4ea4\u4e4b\u540e Git \u4f1a\u663e\u793a\u7c7b\u4f3c\u4e0b\u9762\u7684\u5185\u5bb9\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>&#91;master (root-commit) ebb2157] Added .gitignore and .gitattributes\r\n 2 files changed, 191 insertions(+)\r\n create mode 100644 .gitattributes\r\n create mode 100644 .gitignore<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain md-expand\">\u8fd9\u65f6\u5982\u679c\u6211\u4eec\u518d\u67e5\u770b\u4ed3\u5e93\u72b6\u6001\uff0c\u4f1a\u53d1\u73b0 Git \u4e0d\u4f1a\u518d\u5c55\u793a\u8fd9\u4e24\u4e2a\u914d\u7f6e\u6587\u4ef6\u7684\u4fe1\u606f\u4e86\uff0c\u56e0\u4e3a\u5b83\u4eec\u4e0d\u662f\u65b0\u6587\u4ef6\uff0c\u4e14\u81ea\u4e0a\u6b21\u63d0\u4ea4\u540e\u6ca1\u6709\u88ab\u4fee\u6539\u8fc7\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u4e0b\u9762\u6211\u4eec\u63d0\u4ea4\u6240\u6709\u6587\u4ef6\u5230\u6682\u5b58\u533a\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git add -A<\/code><\/pre>\n\n\n<p>\u6216\u8005\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>git add .<\/code><\/pre>\n\n\n<p>\u8fd9\u65f6 Git \u53ef\u80fd\u4f1a\u663e\u793a\u4e00\u4e9b\u8b66\u544a\uff0c\u6bd4\u5982\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>warning: LF will be replaced by CRLF in Assets\/Scripts\/SimpleCameraController.cs.\r\nThe file will have its original line endings in your working directory\r\n...<\/code><\/pre>\n\n\n<p>\u8fd9\u662f\u6362\u884c\u7b26\u5bfc\u81f4\u7684\uff0c\u4f60\u53ef\u4ee5\u5ffd\u7565\u5b83\uff0c\u4f46\u5982\u679c\u60f3\u5173\u6389\u8fd9\u4e2a\u8b66\u544a\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>git config --global core.safecrlf false<\/code><\/pre>\n\n\n<p>\u73b0\u5728\u8be5\u6587\u4ef6\u4fdd\u5b58\u5728\u4e86\u6682\u5b58\u533a\uff0c\u6267\u884c\u63d0\u4ea4\u547d\u4ee4\u5c06\u5b83\u63d0\u4ea4\u81f3\u4ed3\u5e93\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>git commit -m \"Initial commit of project assets.\"<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u518d\u6b21\u6267\u884c <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>git status -s<\/code><\/span><span class=\"md-plain md-expand\"> \u5c06\u4e0d\u518d\u663e\u793a\u8be5\u6587\u4ef6\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u63a8\u9001\u81f3\u8fdc\u7a0b\u4ed3\u5e93<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u4e4b\u524d\u7684\u6240\u6709\u5de5\u4f5c\u90fd\u662f\u9488\u5bf9\u672c\u5730 Git \u4ed3\u5e93\u7684\uff0c\u73b0\u5728\u8be5\u8fde\u63a5\u5230\u8fdc\u7a0b\u4ed3\u5e93\u4e86\u3002\u9996\u5148\u4f60\u5f97\u5728 GitHub \u6216\u8005 Azure DevOps \u7b49\u6258\u7ba1\u7f51\u7ad9\u4e0a\u521b\u5efa\u4e00\u4e2a\u65b0\u4ed3\u5e93\u3002\u8fd9\u4e2a\u6b65\u9aa4\u5f88\u7b80\u5355\uff0c\u5982\u679c\u53ef\u4ee5\uff0c\u5728\u521b\u5efa\u7684\u65f6\u5019\u9009\u62e9\u3010\u4e0d\u8981\u521b\u5efa ReadMe \u6587\u4ef6\u3011\uff0c\u8fd9\u5c06\u8ba9\u63a8\u9001\u521d\u59cb\u5316\u7684\u672c\u5730\u4ed3\u5e93\u66f4\u52a0\u5bb9\u6613\u3002<\/span><\/p>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain\">\u5728\u6258\u7ba1\u7f51\u7ad9\u521b\u5efa\u597d\u4ed3\u5e93\u540e\uff0c\u4ee5 GitHub \u4e3a\u4f8b\uff0c\u5b83\u4f1a\u663e\u793a\u7528\u4e8e\u8fde\u63a5\u8be5\u4ed3\u5e93\u7684 URL \u3002\u7528 HTTPS \u534f\u8bae\u6765\u5efa\u7acb\u8fde\u63a5\u7684\u8bdd\uff0c\u53ef\u5728\u672c\u5730\u4ed3\u5e93\u76ee\u5f55\u4e0b\u91c7\u7528\u4e0b\u9762\u7684\u547d\u4ee4\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git remote add origin https:\/\/...remote url...<\/code><\/pre>\n\n\n<p>\u73b0\u5728\uff0c\u53ef\u4ee5\u5411\u8fdc\u7a0b\u4ed3\u5e93\u63a8\u9001\u5185\u5bb9\u4e86\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>git push origin main<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u5c06\u672c\u5730\u4ed3\u5e93\u7684\u5f53\u524d\u5206\u652f\uff0c\u63a8\u9001\u5230\u8fdc\u7a0b\u4ed3\u5e93\u7684 main \u5206\u652f\u4e0a\u3002<\/span><\/p>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain md-expand\">\u63a8\u9001\u81f3\u8fdc\u7a0b\u4ed3\u5e93\u9700\u8981\u76f8\u5e94\u7684\u6743\u9650\uff0c\u5982\u7528 SSH \u6765\u8fdb\u884c\u8fa8\u8ba4\u8be5\u63a8\u9001\u8bf7\u6c42\u662f\u5426\u5408\u6cd5\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u514b\u9686\u8fdc\u7a0b\u4ed3\u5e93\u5230\u672c\u5730<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u73b0\u5728\u4ed3\u5e93\u5df2\u7ecf\u88ab\u63a8\u9001\u5230\u4e86\u8fdc\u7a0b\u670d\u52a1\u5668\u4e0a\uff0c\u5176\u4ed6\u4eba\u53ef\u4ee5\u4ece\u8fdc\u7a0b\u670d\u52a1\u5668\u4e0a\u5c06\u5176\u514b\u9686\u4e00\u4efd\u5230\u672c\u5730\uff08\u5982\u679c\u662f\u79c1\u6709\u4ed3\u5e93\uff0c\u8bf7\u786e\u4fdd\u4ed6\u4eec\u6709\u88ab\u6388\u4e88\u8bbf\u95ee\u6743\u9650\uff09\u3002\u4f7f\u7528 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>clone<\/code><\/span><span class=\"md-plain\"> \u547d\u4ee4\u548c\u4ed3\u5e93 URL \u6765\u8fdb\u884c\u514b\u9686\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git clone https:\/\/...remote url...<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p\"><span class=\"md-plain md-expand\">\u8fd9\u4e2a\u547d\u4ee4\u4f1a\u5728\u5f53\u524d\u76ee\u5f55\u4e0b\u521b\u5efa\u4e00\u4e2a\u5b50\u76ee\u5f55\uff0c\u8be5\u5b50\u76ee\u5f55\u5305\u542b\u8fdc\u7a0b\u4ed3\u5e93\u7684\u6240\u6709\u6587\u4ef6\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u4ece\u8fdc\u7a0b\u4ed3\u5e93\u66f4\u65b0\u6587\u4ef6<\/span><\/h2>\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain\">\u5f53\u5728\u4ed3\u5e93\u4fee\u6539\u6216\u6dfb\u52a0\u6587\u4ef6\u540e\uff0c\u5e94\u8be5\u5c06\u5b83\u4eec\u63d0\u4ea4\u4e0a\u53bb\uff0c\u4ee5\u786e\u4fdd\u5de5\u4f5c\u8fdb\u5ea6\u4e0d\u4f1a\u4e22\u5931\uff0c\u5e76\u4e14\u5176\u4ed6\u4eba\u80fd\u591f\u83b7\u53d6\u8fd9\u4e9b\u4fee\u6539\u540e\u7684\u6587\u4ef6\uff0c\u8fd9\u4e00\u6b65\u548c\u4e4b\u524d\u4f7f\u7528 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>add<\/code><\/span><span class=\"md-plain\"> \u548c <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>commit<\/code><\/span><span class=\"md-plain\"> \u547d\u4ee4\u4e00\u6837\u3002\u5728\u5c1d\u8bd5\u63a8\u9001\u66f4\u65b0\u524d\uff0c\u6700\u597d\u5148\u4ece\u8fdc\u7a0b\u670d\u52a1\u5668\u62c9\u53d6\u4e00\u6b21\u66f4\u65b0\u3002\u4f60\u53ef\u4ee5\u4f7f\u7528 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>pull<\/code><\/span><span class=\"md-plain\"> \u547d\u4ee4\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>git pull<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain md-expand\">\u5982\u679c\u6709\u4efb\u4f55\u6587\u4ef6\u9700\u8981\u66f4\u65b0\uff0c<\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>pull<\/code><\/span><span class=\"md-plain\"> \u547d\u4ee4\u4f1a\u5c06\u5b83\u4eec\u68c0\u7d22\u5230\u672c\u5730\u5b58\u50a8\u5e93\u5e76\u5c06\u4efb\u4f55\u66f4\u6539\u540c\u6b65\u5230\u4f60\u7684\u672c\u5730\u4ed3\u5e93\u91cc\u3002\u5f53\u6709\u6587\u4ef6\u56e0\u4e3a\u4ea7\u751f\u51b2\u7a81\u800c\u4e0d\u80fd\u88ab\u81ea\u52a8\u5408\u5e76\u65f6\uff0cGit \u4f1a\u542f\u52a8\u914d\u7f6e\u597d\u7684\u5408\u5e76\u5de5\u5177\u3002\u4fee\u6539\u5b8c\u6709\u51b2\u7a81\u7684\u6587\u4ef6\u540e\uff0c\u8fd9\u4e9b\u6587\u4ef6\u9700\u8981\u91cd\u65b0\u63d0\u4ea4\u5230\u6682\u5b58\u533a\uff0c\u5e76\u6267\u884c\u4e00\u6b21 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>commit<\/code><\/span><span class=\"md-plain\"> \u547d\u4ee4\uff0c\u6700\u540e\u624d\u80fd\u5c06\u6240\u6709\u66f4\u6539\u63a8\u9001\u5230\u670d\u52a1\u5668\u3002<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u5728\u8fd9\u70b9\u4e0a\uff0c\u6211\u7ecf\u5e38\u5207\u6362\u81f3 GUI \u5ba2\u6237\u7aef\uff0c\u56e0\u4e3a\u5b83\u66f4\u4fbf\u4e8e\u6211\u5728\u63d0\u4ea4\u524d\u6d4f\u89c8\u6709\u54ea\u4e9b\u4fee\u6539\u3002\u547d\u4ee4\u884c\u5ba2\u6237\u7aef\u5bf9\u4e8e Git \u9ad8\u7ea7\u547d\u4ee4\u4ecd\u7136\u5f88\u6709\u7528\uff0c\u5982\u679c\u4fee\u6539\u7684\u90e8\u5206\u6bd4\u8f83\u5c11\uff0c\u90a3\u4e48\u7528\u547d\u4ee4\u884c\u5ba2\u6237\u7aef\u4f1a\u66f4\u5feb\u4e00\u4e9b\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">Git \u547d\u4ee4\u522b\u540d<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u4e3a\u4e86\u8ba9\u547d\u4ee4\u884c\u5ba2\u6237\u7aef\u4f7f\u7528\u8d77\u6765\u66f4\u65b9\u4fbf\uff0cGit \u652f\u6301\u7528\u6237\u81ea\u5b9a\u4e49\u547d\u4ee4\u522b\u540d\uff08Aliases\uff09\u3002\u522b\u540d\u53ef\u4ee5\u5728 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitconfig<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\u4e2d\u6dfb\u52a0\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>&#91;alias]\r\n  ...<\/code><\/pre>\n\n\n<p><span class=\"md-plain md-expand\">\u5982\u679c\u522b\u540d\u4ee5\u3010 ! \u3011\u5f00\u5934\uff0c\u90a3\u4e48 Git \u4f1a\u6267\u884c\u5b8c\u6574\u7684 shell \u547d\u4ee4\u3002\u4f8b\u5982\uff0c\u6211\u4eec\u521b\u5efa\u4e00\u4e2a <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>commit-all<\/code><\/span><span class=\"md-plain\"> \u522b\u540d\uff0c\u7528\u4e8e\u6dfb\u52a0\u6240\u6709\u4fee\u6539\u5230\u6682\u5b58\u533a\uff0c\u5e76\u4e14\u6267\u884c <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>commit<\/code><\/span><span class=\"md-plain\"> \u547d\u4ee4\uff1a<\/span><\/p>\n\n\n<pre class=\"wp-block-code\"><code>&#91;alias]\r\n    # Add all and commit:\r\n    commit-all = \"!git add -A;git commit\" <\/code><\/pre>\n\n\n<p>\u8fd9\u4e2a\u522b\u540d\u53ef\u4ee5\u8fd9\u6837\u4f7f\u7528\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code>git commit-all -m \"Another great commit.\"<\/code><\/pre>\n\n\n<p>\u5bf9\u4e8e\u53ea\u662f Git \u547d\u4ee4\u53c2\u6570\u7684\u522b\u540d\uff0c\u3010 ! \u3011 \u5c31\u4e0d\u9700\u8981\u4e86\u3002\u6bd4\u5982\u8981\u521b\u5efa\u4e00\u4e2a\u7528\u77ed\u8f93\u51fa\u683c\u5f0f\u663e\u793a\u4ed3\u5e93\u72b6\u6001\u7684\u522b\u540d\uff1a<\/p>\n\n\n<pre class=\"wp-block-code\"><code># Short git status output:\r\ns = \"status -s\"<\/code><\/pre>\n\n\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-plain md-expand\">\u522b\u540d\u53ef\u4ee5\u66f4\u597d\u5730\u4e0e\u547d\u4ee4\u884c\u5ba2\u6237\u7aef\u4e00\u8d77\u5de5\u4f5c\uff0c\u56e0\u4e3a\u5b83\u53ef\u4ee5\u4e3a\u590d\u6742\u7684\u547d\u4ee4\u63d0\u4f9b\u6709\u610f\u4e49\u7684\u540d\u79f0\uff0c\u5e76\u4e14\u5728\u4f7f\u7528 \u3010tab-completion\u3011\u540e\uff0c\u522b\u540d\u4eec\u4f1a\u548c Git \u5185\u7f6e\u547d\u4ee4\u4e00\u8d77\u663e\u793a\u51fa\u6765\uff1apress <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>TAB<\/code><\/span><span class=\"md-plain\"> after typing <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>git &lt;space&gt;<\/code><\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u4f60\u53ef\u4ee5\u5728\u8fd9\u91cc\u83b7\u53d6\u4e00\u4e9b<\/span><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/hextantstudios.com\/git-aliases\/\"><span class=\"md-plain\">\u6709\u7528\u7684\u522b\u540d\u6e05\u5355<\/span><\/a><\/span><span class=\"md-plain\">\u3002<\/span><\/p>\n<h2 class=\"md-end-block md-heading\"><span class=\"md-plain\">\u83b7\u53d6\u66f4\u591a\u6709\u5173 Git \u7684\u59ff\u52bf<\/span><\/h2>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">Git \u8fd8\u6709\u5927\u91cf\u7684\u91cd\u8981\u4fe1\u606f\uff0c\u5f53\u7136\u8fd8\u6709\u5f88\u591a\u4e1c\u897f\u9700\u8981\u5b66\u4e60\u3002\u5e0c\u671b\u672c\u6587\u6709\u52a9\u4e8e\u6d88\u9664\u5728\u4f60\u7684\u9879\u76ee\u4e2d\u4f7f\u7528 Git \u7684\u4e00\u4e9b\u7591\u60d1\u3002\u53ea\u8981\u786e\u4fdd\u6839\u636e\u9700\u8981\u66f4\u65b0 <\/span><span class=\"md-pair-s\" spellcheck=\"false\"><code>.gitattributes<\/code><\/span><span class=\"md-plain\"> \u6587\u4ef6\uff0c\u4ee5\u4fbf LFS \u6b63\u786e\u5904\u7406\u65b0\u7684\u4e8c\u8fdb\u5236\u6587\u4ef6\u7c7b\u578b\uff01<\/span><\/p>\n<p class=\"md-end-block md-p\"><span class=\"md-plain\">\u8981\u4e86\u89e3\u6709\u5173 Git \u7684\u66f4\u591a\u4fe1\u606f\uff0c\u8fd9\u91cc\u6709\u4e00\u4e9b\u5f88 awesome \u7684\u5b66\u4e60\u8d44\u6e90\uff1a<\/span><\/p>\n<ul class=\"ul-list\" data-mark=\"-\">\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/git-scm.com\/doc\"><span class=\"md-plain\">Git \u6587\u6863<\/span><\/a><\/span><\/p>\n<\/li>\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/git-scm.com\/book\/en\/v2\"><span class=\"md-plain\">Pro Git<\/span><\/a><\/span><span class=\"md-plain\"> &#8211; \u5c3d\u7ba1\u540d\u79f0\u6709 Pro \uff0c\u4f46\u5b83\u4ece\u57fa\u7840\u8bb2\u8d77\uff0c\u5e76\u63d0\u4f9b\u7535\u5b50\u4e66\u683c\u5f0f<\/span><\/p>\n<\/li>\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/stackoverflow.com\/questions\/tagged\/git\"><span class=\"md-plain\">Stackoverflow \u4e0a\u7684 Git<\/span><\/a><\/span><span class=\"md-plain\"> &#8211; \u5982\u679c\u60a8\u6709\u4e0e Git \u76f8\u5173\u7684\u95ee\u9898\uff0c\u53ef\u80fd\u5df2\u7ecf\u6709\u4eba\u63d0\u51fa\u8fc7\u5e76\u5f97\u5230\u4e86\u89e3\u51b3\u529e\u6cd5<\/span><\/p>\n<\/li>\n<li class=\"md-list-item\">\n<p class=\"md-end-block md-p\"><span class=\"md-meta-i-c  md-link\"><a href=\"https:\/\/github.com\/doggy8088\/Learn-Git-in-30-days\"><span class=\"md-plain\">Learn-Git-in-30-days<\/span><\/a><\/span><span class=\"md-plain\"> &#8211; \u4e2d\u6587\u5b66\u4e60\u8d44\u6599<\/span><\/p>\n<\/li>\n<li class=\"md-list-item md-focus-container\">\n<p class=\"md-end-block md-p md-focus\"><span class=\"md-meta-i-c md-link md-expand\"><a href=\"https:\/\/learngitbranching.js.org\/?locale=zh_CN\"><span class=\"md-plain\">LearnGitBranching<\/span><\/a><\/span><span class=\"md-plain md-expand\"> &#8211; \u56fe\u5f62\u5316\u5b66\u4e60\u7f51\u7ad9\uff08\u4e2d\u6587\u7248\uff09<\/span><\/p>\n<\/li>\n<\/ul>","protected":false},"excerpt":{"rendered":"<p>\u672c\u6587\u7ae0\u7ffb\u8bd1\u81ea\uff1ahttps:\/\/hextantstudios.com\/unity-using-git\/ \u5728Uni [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[17],"tags":[21,20],"class_list":["post-1178","post","type-post","status-publish","format-standard","hentry","category-unity3d","tag-git","tag-unity"],"_links":{"self":[{"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/posts\/1178","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/comments?post=1178"}],"version-history":[{"count":12,"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/posts\/1178\/revisions"}],"predecessor-version":[{"id":1225,"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/posts\/1178\/revisions\/1225"}],"wp:attachment":[{"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/media?parent=1178"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/categories?post=1178"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/summid.icu\/index.php\/wp-json\/wp\/v2\/tags?post=1178"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}