Äú¿ÉÒÔ¾èÖú£¬Ö§³ÖÎÒÃǵĹ«ÒæÊÂÒµ¡£

1Ôª 10Ôª 50Ôª





ÈÏÖ¤Â룺  ÑéÖ¤Âë,¿´²»Çå³þ?Çëµã»÷Ë¢ÐÂÑéÖ¤Âë ±ØÌî



  ÇóÖª ÎÄÕ ÎÄ¿â Lib ÊÓÆµ iPerson ¿Î³Ì ÈÏÖ¤ ×Éѯ ¹¤¾ß ½²×ù Model Center   Code  
»áÔ±   
   
 
     
   
 ¶©ÔÄ
  ¾èÖú
gitÔ­Àíͼ½â
 
×÷Õߣº»ÒÌ«ÀÉ^_^
  4114  次浏览      27
 2020-2-7
 
±à¼­ÍƼö:
±¾ÎÄ×ܽáÁËgit µÄ»ù±¾Àí½â£º´úÂëµÄ´æÔÚÇøÓò£»²¢ÇÒÒÔʵ¼ÊÏîÄ¿³ö·¢£¬ÀíÇåʹÓÃgit¹ý³ÌÖУ¬´úÂëµÄǨáãÁ÷³Ì£¬Ï£Íû¶ÔÄúÄÜÓÐËù°ïÖú¡£
±¾ÎÄÀ´×Ôcnblogs£¬ÓÉ»ðÁú¹ûÈí¼þLuca±à¼­¡¢ÍƼö¡£

Ŀ¼

1.Ìá½» ´úÂëµ½Ô¶³Ì²Ö¿â

2.½«Ô¶³Ì²Ö¿â´úÂë¸üе½±¾µØ

3.¸üе½±¾µØ²Ö¿âʱ£¬ ³öÏÖ³åÍ»£¬½â¾ö³åÍ»

ºó¼Ç£º

ÕýÎÄ

±¾Îı³¾°£¬ÔÚʵ¼ÊÏîÄ¿ÖÐʹÓÃgitÒÑÓÐÒ»Ä꣬·¢ÏÖ²»ÉÙͬÊÂËäÈ»»áʹÓó£ÓÃgitÖ¸Áµ«²¢²»Àí½âÿ¸öÖ¸Áî¶ÔÓ¦µÄ×÷ÓÃÔ­Àí¡£½ñÌì¾²ÏÂÐÄ×ܽáÏÂgit µÄ»ù±¾Àí½â£º´úÂëµÄ´æÔÚÇøÓò£»±¾ÎÄÒÔʵ¼ÊÏîÄ¿³ö·¢£¬ÀíÇåʹÓÃgit¹ý³ÌÖУ¬´úÂëµÄǨáãÁ÷³Ì¡£

git¸ú´«Í³µÄ´úÂë¹ÜÀíÆ÷£¨Èç:svn£©²»Í¬£¬ Ö÷񻂿±ðÔÚÓÚgit¶àÁ˸ö±¾µØ²Ö¿âÒÔ¼°»º´æÇø£¬ËùÒÔ¼´Ê¹ÎÞ·¨ÁªÍøÒ²Ò»ÑùÄÜÌá½»´úÂë¡£ÊõÓï½âÊÍ£º

¹¤×÷Çø¼ä: ¼´ÎÒÃÇ´´½¨µÄ¹¤³ÌÎļþ£¬ Ôڱ༭Æ÷¿ÉÖ±¹ÛÏÔʾ£»

»º´æÇø: Ö»ÄÜͨ¹ýgit GUI»ògit shell ´°¿ÚÏÔʾ£¬Ìá½»´úÂë¡¢½â¾ö³åÍ»µÄÖÐתվ£»

±¾µØ²Ö¿â: Ö»ÄÜÔÚgit shell ´°¿ÚÏÔʾ£¬Á¬½Ó±¾µØ´úÂë¸úÔ¶³Ì´úÂëµÄÊàŦ£¬²»ÄÜÁªÍøÊ±±¾µØ´úÂë¿ÉÏÈÌá½»ÖÁ¸Ã´¦£»

Ô¶³Ì²Ö¿â: ¼´±£´æÎÒÃÇ´úÂëµÄ·þÎñÆ÷£¬±¾ÎÄÒÔ¹«¹²°æ±¾¿ØÖÆÏµÍ³£ºgithubΪÀý£¬µÇ¼githubÕ˺źó¿ÉÖ±¹ÛÏÔʾ£»

½ÓÏÂÀ´£¬ ÎÒÃÇÒÔÈý¸öʵ¼Ê²Ù×÷µÄÀý×Ó½²½âgitµÄÈÕ³££¬´úÂëÈçºÎÔÚÉÏÊö4¸öÇøÓòÁ÷¶¯¡£

 

1.Ìá½» ´úÂëµ½Ô¶³Ì²Ö¿â

Ê×ÏÈÔÚ±¾µØ¹¤×÷Çø¼ä´´½¨Ò»¸öй¤³Ì£ºtestGit£¬È»ºóÔÚÏîÄ¿Àïн¨Ò»¸öREADME.md£¬ ¹¤×÷Çø¼äµÄ¹¤³ÌÈçÏ£º

Ô¶³Ì²Ö¿â´´½¨Ò»Ð¹¤³Ì

½«¸Ãн¨µÄ¹¤³ÌÌá½»ÖÁÔ¶³Ì²Ö¿â£¬¹Ø¼üµÄgit Ö¸ÁîÈçÏ£º

git init
git add README.md
git commit -m "Ê×´ÎÌá½»´úÂë"
git remote add origin https://github.com/wteam-xq/testGit.git
git push -u origin master

Ö¸Áî½âÊÍ£º

`git init ` ±íʾÔÚµ±Ç°µÄÏîĿĿ¼ÖÐÉú³É±¾µØµÄgit¹ÜÀí£»

`git add README.md` ½«¡°README.md¡±Îļþ±£´æÖÁ»º´æÇø£¬Êµ¼Ê¿ª·¢ÖÐÒ»°ãʹÓà `git add -A`£¬Ê¹ÓÃ-A:½«ÐÂÔö¡¢É¾³ý¡¢Ð޸ĵÄÎļþ¸Ä¶¯È«±£´æÖÁ»º´æÇø£»

`git commit -m "first commit"` ½«´úÂë´Ó»º´æÇø±£´æÖÁ±¾µØ²Ö¿â£¬Êµ¼Ê¿ª·¢ÖÐÒ»°ãʹÓÃ`git commit -am "˵Ã÷µÄÎÄ×Ö"`£¬Ê¹Óà -a£ºÈç¹ûûÎļþ¸ü¸Ä²Ù×÷£¨Ôö¡¢É¾¡¢¸ÄÃû£©¾Í¿ÉÒÔÊ¡ÂÔgit addÖ¸Á

`git remote add origin https://github.com/wteam-xq/testGit.git`½«±¾µØ²Ö¿âÓëÖ¸¶¨µÄÔ¶³Ì²Ö¿â´´½¨ ÁªÏµ£»

`push -u origin master` ½«±¾µØ²Ö¿â´úÂëÍÆËÍÖÁÔ¶³Ì²Ö¿â£¬Êµ¼Ê¿ª·¢ÖÐ ¸ÃÖ¸ÁîºóÐèÒªÊäÈëgithub Õ˺ÅÒÔ¼°ÃÜÂë¡££¨Ê×´ÎÌá½»×¢Òâ±ðÒÅ©`-u`Ö¸¶¨Ä¬ÈÏÖ÷»ú£©

ÒÔÉÏÖ¸ÁîÕý³£Ö´ÐÐºó£¬ ±¾µØ²Ö¿âµÄ´úÂë¾ÍÌá½»µ½Ô¶³Ì²Ö¿âÁË£º

Ô­ÀíͼÈçÏ£º

2.½«Ô¶³Ì²Ö¿â´úÂë¸üе½±¾µØ

Ê×ÏÈÎÒÃÇн¨Ò»Îļþ¼Ð£ºcopyTestGit£¬½øÈë¸ÃÎļþ¼ÐºóʹÓÃgit Ö¸Á

git clone https://github.com/wteam-xq/testGit

Ö¸ÁîÖ´ÐÐÍê±Ïºó£¬ ¾ÍÔÚ¸ÃÎļþ¼ÐÏÂÉú³ÉÒ»·Ý¸±±¾À²£¨Ï൱ÓÚ¶àÈËЭ×÷ʱÁíһ̨É豸ÉϵŤ³ÌÎļþ£©£¬Ô­ÀíͼÈçÏ£º

½ÓÏÂÀ´£¬ ÌÖÂÛ`git pull`¡¢ `git fetch` ¡¢ `git merge`µÄ¹ØÏµ

ÏÈÅ×¼òµ¥½áÂÛ:

git pull
#µÈͬÓÚÏÂÃæÃüÁî
git fetch
git merge

ʵ¼ÊÏîÄ¿£ºÎÒÃÇÔÚtestGit¹¤³ÌÖÐÐÞ¸ÄREADME.md,È»ºó¸üС¢ÌύϴúÂë Ö´ÐÐÒÔÏÂgit Ö¸Áî(ÈÕ³£Ê¹ÓÃÖлáÓÃ`git status`¿´¿´ÊÇ·ñÓÐÎļþÐèÒª`git add`)£º

git commit -am 'update readme.md'
git push origin master

Ô­ÀíͼÈçÏ£º

Ô¶³Ì²Ö¿â´úÂë¸üÐÂºó£¬ ÎÒÃǽøÈëÁíÒ»±¾µØ²Ö¿â£ºcopyTestGit\testGit£¬½«Ô¶³Ì²Ö¿âµÄ´úÂë¸üÐÂÖÁ¸Ã±¾µØ²Ö¿â¡£

ÔÚ¸ÃĿ¼ÏÂÊäÈëÒÔÏÂgitÖ¸Á

git fetch
git merge origin/master

ÈÕ³£Ê¹ÓÃͼ·½±ãÒ»°ã¶¼ÊÇÖ±½Ó£º

git pull

ÒÔÉÏÖ¸ÁîµÄÏêϸ̽ÌÖÇë¿´ ÉÙÓÃpull,¶àÓÃfetch ºÍ merge

£¨×¢Òâ: ±¾ÎÄ×¢ÖØgit¹¤×÷Ô­Àíͼ²»¿¼ÂǶà·ÖÖ§Çé¿ö£¬ÇÒʹÓÃÁËgit cloneËùÒÔ¸±±¾¹¤³ÌÒѾ­¸úÖ÷·ÖÖ§½¨Á¢ÁË×·×Ù¹ØÏµ£¬ËùÒÔ'pull' 'fetch' ºó¶¼²»½Ó·ÖÖ§´úÂë £©

ÒÔÉÏÖ¸ÁîÇø±ðµÄÔ­Àíͼ£º

3.¸üе½±¾µØ²Ö¿âʱ£¬ ³öÏÖ³åÍ»£¬½â¾ö³åÍ»

Ê×ÏÈ£¬ ÎÒÃÇÏÈÖØÏÖϳöÏÖ³åÍ»µÄÇé¿ö£» ÔÚtestGitĿ¼ÏÂÏÈÐÞ¸ÄREADME.mdÎļþµÚÈýÐУ¬hello word ÐÞÕýΪ hello world£º

Ìá½»¸ÃÐ޸ĵ½Ô¶³Ì²Ö¿â£¨Ìύϸ½Ú²ÎÕÕǰÊö²½Ö裩£º

È»ºó£¬ ÔÚ¸±±¾¹¤³ÌcopyTestGit/testGit Ŀ¼ÏÂÒ²ÐÞ¸ÄREADME.mdÎļþµÚÈýÐУ¬hello word ÐÞÕýΪ hello world2£º

ÏÖÔÚ¸±±¾¹¤³ÌÐÞ¸ÄÍêÁË´úÂë´òËãÌá½»£¬ÌύǰÏȽ«Ô¶³Ì²Ö¿â×îдúÂë¸üÐÂÖÁ±¾µØ²Ö¿â, ¹ßÀýʹÓÃÖ¸Áî:

git pull

Ö¸ÁîÖ´ÐÐÖ®ºó»á·¢ÏÖÒÔϳåÍ»Ìáʾ£º

³öÏÖÒÔÉÏÌáʾ£¬ ˵Ã÷±¾´Î¸üдúÂëʧ°Ü£»Ö÷ÒªÔÚÓÚ±¾µØ¹¤×÷Çø¼ä¸úÔ¶³Ì²Ö¿âµÄдúÂë³åÍ»ÁË£¬ ͼ½âÈçÏ£º

½ÓÏÂÀ´£¬ÓÐÁ½ÖÖ·½Ê½´¦Àí³åÍ»: ·ÅÆú±¾µØÐ޸Ļò ½â¾ö³åÍ»ºóÌá½»±¾µØÐÞ¸Ä

3.1 ·ÅÆú±¾µØÐÞ¸Ä

·ÅÆú±¾µØÐÞ¸ÄÒâζ׎«Ô¶³Ì²Ö¿âµÄ´úÂëÍêÈ«¸²¸Ç±¾µØ²Ö¿âÒÔ¼°±¾µØ¹¤×÷Çø¼ä£¬ Èç¹û¶ÔgitµÄÖ¸Áî²»ÊìϤÄÇ´ó¿ÉÒÔ½«±¾µØ¹¤³ÌÍêȫɾ³ý£¬È»ºóÔÙÖØÐ¿½±´Ò»´Î£¨`git clone`£©¡£

µ±È»£¬ gitÈç´ËÇ¿´óû±ØÒªÓÃÕâôԭʼµÄ·½·¨£¬¿ÉÒÔÈñ¾µØ²Ö¿â´úÂ븲¸Ç±¾µØÐ޸ģ¬È»ºó¸üÐÂÔ¶³Ì²Ö¿â´úÂ룻

±¾µØ²Ö¿â´úÂëÍêÈ«¸²¸Ç±¾µØ¹¤×÷Çø¼ä£¬¾ßÌåÖ¸ÁîÈçÏ£º

git checkout head .

(×¢Ò⣺ ±ðÒÅ© "head" ºóµÄ " ." )

È»ºó¸üÐÂÔ¶³Ì²Ö¿âµÄ´úÂë¾Í²»»á³öÏÖ³åÍ»ÁË:

git pull

Ô­ÀíͼÈçÏ£º

3.2 ½â¾ö³åÍ»ºóÌá½»±¾µØÐÞ¸Ä

¸²¸Ç±¾µØ´úÂë½â¾ö³åÍ»·½·¨Êʺϲ»Ì«¶®gitµÄ²ËÄñ£¬ ÏñÎÒÕâÖÖgitÀÏÄñ£¨Æäʵ²¢²»ÊÇ(©V_©V)£©µ±È»Óøü¸ß¼¶µÄgitÖ¸Áî½â¾ö³åÍ»¡£

ϸÐĵÄͬѧ»òÐíÒÑ·¢ÏÖ£¬»º´æÇø ³ýÁË¿ªÊ¼³öÏÖÍ⣬ºóÐøÌá½»´úÂë¡¢¸üдúÂëÆªÕ¶¼ÔÚ´ò½´ÓÍ£»ÖÕÓÚ£¬Õâ´Î³åÍ»½â¾öʼþ£¬ Ëü½«»áÊÇÖ÷½Ç!

½â¾ö³åÍ»ºóÌá½»±¾µØÐ޸ĵÄ˼·´ó¸ÅÈçÏ£º

½«±¾µØÐ޸ĵĴúÂë·ÅÔÚ»º´æÇø£¬ È»ºó´ÓÔ¶³Ì²Ö¿âÀ­È¡×îдúÂ룬À­È¡³É¹¦ºóÔÙ´Ó»º´æÇø½«Ð޸ĵĴúÂëÈ¡³ö£¬ ÕâÑù×îдúÂë¸ú±¾µØÐ޸ĵĴúÂë¾Í»á»ìÔÓÔÚÒ»Æð£¬ ÊÖ¹¤½â¾ö³åÍ»ºó£¬ Ìá½»½â¾ö³åÍ»ºóµÄ´úÂë¡£

Ô­Àíͼ£º

¶ÔÓ¦µ½ÎÒÃÇʵ¼ÊÏîÄ¿ÖУ¬ ½øÈë copyTestGit/testGit Ö´ÐÐÖ¸Áî`git pull`³öÏÖ (ÖØ»Øµ½ÉÏÊö³åÍ»³¡¾°)

error: Your local changes to the following files would be overwritten by merge:
README.md
Please, commit your changes or stash them before you can merge.
Aborting

½«±¾µØÐ޸ķÅÈ뻺´æÇø(³É¹¦ºó±¾µØ¹¤×÷Çø¼äµÄ´úÂë¸ú±¾µØ²Ö¿â´úÂë»áͬ²½)£¬ ¾ßÌåÖ¸Á

git stash

´ÓÔ¶³Ì²Ö¿â»ñÈ¡×îдúÂ룬¾ßÌåÖ¸Á

git pull

È»ºó£¬ È¡³ö±¾µØÐ޸ĵĴúÂ룬 ¾ßÌåÖ¸Áî:

git stash pop

È»ºó£¬ git ×Ô¶¯ºÏ²¢³åͻʧ°Ü£¬ ³åÍ»µÄ´úÂë¾ÍºÜÇåÎúµÄÕ¹ÏÖÔÚÎÒÃÇÃæÇ°ÁË£º

ÊÖ¹¤½â¾ö³åÍ»£º

¸æËßgit£¬ Õâ¸öÎļþ£¨README.md£©µÄ³åÍ» ÒѾ­½â¾ö:

git add README.md

Ìá½»´úÂ루ϸ½Ú²Î¿¼Ç°ÊöÁ÷³Ì£©£º

git commit -am 'ÖÕÓÚ½â¾ö³åÍ»À²£¡'
git push origin master

ÓÚÊDZ¾µØÓгåÍ»µÄ´úÂë¾ÍÌá½»³É¹¦À²£¡

ºó¼Ç£º

ÒÔÉϺܶàgitÖ¸ÁîÊʺÏÔÚÎÞͼÐλ¯½çÃæµÄlinuxÖÐʹÓã¨ÀýÈ磺°¢ÀïÔÆ·þÎñÆ÷²Ù×÷git£©£¬ ʵ¼Ê¿ª·¢Öе±È»ÊÇÓÃͼÐλ¯½çÃæ½â¾ö!

½â¾ö³åͻ֮¸²¸Ç±¾µØ´úÂë¶ÔÓ¦µÄÊÇ£º ¹¤³ÌĿ¼ÏÂtortoiseGit(git СÎÚ¹ê) ¡°Revert¡± £º

½â¾ö³åͻ֮½â¾ö³åÍ»ºóÌá½»±¾µØÐ޸ĶÔÓ¦µÄÊÇ£º ÊÖ¹¤ºÏ²¢³åÍ»´úÂëºó£¬¹¤³ÌĿ¼ÏÂtortoiseGit(git СÎÚ¹ê) ¡°resolve¡± £º

 
   
4114 ´Îä¯ÀÀ       27
Ïà¹ØÎÄÕÂ

ÿÈÕ¹¹½¨½â¾ö·½°¸
ÈçºÎÖÆ¶¨ÓÐЧµÄÅäÖùÜÀíÁ÷³Ì
ÅäÖùÜÀíÖ÷Òª»î¶¯¼°ÊµÏÖ·½·¨
¹¹½¨¹ÜÀíÈëÃÅ
Ïà¹ØÎĵµ

ÅäÖùÜÀíÁ÷³Ì
ÅäÖùÜÀí°×ƤÊé
CM09_CÅäÖùÜÀí±ê×¼
ʹÓÃSVN½øÐа汾¿ØÖÆ
Ïà¹Ø¿Î³Ì

ÅäÖùÜÀíʵ¼ù
ÅäÖùÜÀí·½·¨¡¢¹¤¾ßÓëÓ¦ÓÃ
¶à²ã´Î¼¯³ÉÅäÖùÜÀí
²úÆ··¢²¼¹ÜÀí