ä¸.é¦å éè¦å®è£ Gitï¼
è®°å½ä¸ä¸å®è£ çç®å½ï¼ä¸ä¼é ç½®çæ¶åéè¦ç¨å°ã
äº.å¨AndroidStudioä¸è®¾ç½®Gitæ件ï¼
File-Setting-VersionControl-Git
å¨è¿éæ¾å°ä¸é¢å®è£
çGitè·¯å¾ã
ä¸.åå§åGit项ç®ï¼
VCS-Gitå¦æåºç°Gité项说æå®è£ Gitæ件æå
å.ç±Gitæå项ç®ï¼
URLå¡«åGitç项ç®å°åï¼Directoryå¡«åæ£åºé¡¹ç®çç®å½,ç¹å»clone.
å¡«ågitçè´¦å·ï¼å¯ç ï¼ç¹å»okå³å¯.
äº.æ¥çå½å项ç®çGitåæ¯ï¼
æ¥çå½åçgit项ç®æ¯å¨ä¸»åæ¯masterä¸è¿æ¯å¨åæ¯devä¸é¢ï¼ç®åç¹
ç´æ¥æ¥çAsçå³ä¸è.
å .Git项ç®åæ¯åæ¢ï¼
å¦ææ³åæ¢å°å
¶ä»åæ¯
ä¼åºç°Git Branches
éæ©origin/devæè
origin/master
ç¹å»okå³å¯åæ¢.
ä¸.æ¥çGitçæ交æ¥å¿ï¼
ä¼åºç°ä¸ä¸ªéæ©è·¯å¾ç对è¯æ¡ï¼éæ©ä½ è¦æ¥çç项ç®
ç¹å»okå³å¯ï¼å°±ä¼åºç°ä¸ä¸ªlog对è¯æ¡ï¼éé¢ææ交记å½.
å «.ç¨Gitæ交代ç
ä¿®æ¹ä»£ç åï¼å¦æå³å»ä¿®æ¹çæ件ï¼åºç°çå表ä¸æ²¡æGIté项ï¼åéè¦
éä¸Enable Version Control Intergrationâéæ©
ç¹å»OKå³å¯ï¼ä¼åç°AS顶é¨åºç°äºï¼åè¯æAsä¸Gitå
³èæåï¼å¯ä»¥æ交代ç ã
ç¹å»commitChangesè¿å
¥ä¿®æ¹æ件çä¸ä¸ªå¯¹è¯æ¡ï¼æ³¨æä¸è¦å¾é
ç¹å»å³ä¸è§çcommitå³å¯.
ä¹.ææ¶åæå项ç®çæ¶åä¼éå°ä¸ä¸ªé误
The SDK directory âD:\androidSDKâdoes not exist.Please fix the âsdk.dirâ property in the local.properties file
解å³æ¹æ³ï¼
åæ¥å¨workspaceé£éæä¸ä¸ªlocal.propertiesæ件ï¼å¯ä»¥ä¿®æ¹SDKè·¯å¾ï¼å 为æä¹åè£
äºä¸¤æ¬¡Android Studioï¼ç¬¬äºæ¬¡è£
çè·¯å¾å第ä¸æ¬¡çä¸ä¸æ ·ï¼ä½æ¯projectçSDKè·¯å¾æ¯æå第ä¸ä¸ªçï¼æ以æ¥éãæå®æ¹è¿æ¥å°±è¡äºã
äº. AndroidStudioä¸æ°å»ºåæ¯ï¼åæ¯å并ï¼
1.æå¼AndroidStudioåï¼æ¥çå³ä¸è§ï¼å½åæ¯developeråæ¯ï¼ï¼å¦ææ³æå½åçåæ¯åæ¢å°master.
å¨LocalBrancherä¸å³å»éä¸çmasterï¼ç¶åcheckout.æå³çå°masteråæ¯checkå°æ¬å°ï¼æ¤æ¶ï¼AndroidStudioä¸å³ä¸è§å½åçåæ¯å为äºmaster.
2.æ°å»ºä¸ä¸ªåæ¯ï¼ç¹å»AndroidStudioä¸å³ä¸è§çGitåºç°ï¼Git Branches.ç¶åéæ©+new Branch.
ç»æ°åæ¯èµ·ä¸ä¸ªååï¼ç¹å»ok
è¿æ ·å°±å¨å½ååæ¯çåºç¡ä¸æ°å»ºäºä¸ä¸ªdev2åæ¯ï¼å¹¶ä¸å½åçåæ¯å°±åæ¢æäºdev2.
3.ä»è¿ç¨master主åæ¯ä¸æ°æåä¸ä¸ªæ°åæ¯
åååæ¯å¦master1ï¼åå½åå°±æ¯åæ¢å°äºmaster1åæ¯
4.å°å½ååæ¯çæ¹å¨å并å°ä¸»åæ¯ä¸
ç¶åå°è¦å并çåæ¯å³å»ï¼merge