×ðÁú¿­Ê±¹ÙÍøµÇ¼

Ïê½âgitÖÐÔõôÉó²é³åÍ»

ÔÚÍŶÓЭ×÷ÖÐ £¬git ÊǷǾ­³£Óõİ汾¿ØÖƹ¤¾ß¡£¿ÉÊÇÔÚ¶àÈËͬʱÐÞ¸Äͳһ¸öÎļþ»òÕßͳһ¸ö´úÂë¿âʱ £¬¾Í¿ÉÄÜ·ºÆð³åÍ»¡£ÈôÊÇÓÐÈËÔÚÍâµØÒѾ­ÐÞ¸ÄÁËij¸öÎļþ²¢Ìá½»ÁË £¬µ«ÁíһСÎÒ˽ÈËÔÚÔ¶³ÌÒ²ÐÞ¸ÄÁËÕâ¸öÎļþ²¢Ìá½»ÁË £¬Õâʱ¼ä¾Í»á·ºÆð³åÍ»¡£

ÄÇôÔÚ Git ÖÐ £¬ÔõÑùÉó²é³åÍ»ÄØ£¿ÏÂÃæÎÒÃǾÍÀ´ÏÈÈÝһϡ£

¼ì²éÊÇ·ñ±£´æ³åÍ»

ÔÚ Git ÖÐ £¬¿ÉÒÔͨ¹ýÒÔÏÂÏÂÁî¼ì²éÄ¿½ñÎļþÊÇ·ñ±£´æ³åÍ»£º

$ git status

µÇ¼ºó¸´ÖÆ

ÈôÊÇ·ºÆðÀàËÆÈçÏÂÊä³ö £¬Ôò˵Ã÷Ä¿½ñÎļþ±£´æ³åÍ»£º

On branch master
You have unmerged paths.
  (fix conflicts and run "git commit")

µÇ¼ºó¸´ÖÆ

Éó²é³åÍ»Îļþ

ÔÚ¼ì²é³ö±£´æ³åÍ»ºó £¬ÎÒÃÇÐèÒªÉó²éÏêϸÄÄЩÎļþ±£´æ³åÍ» £¬¿ÉÒÔͨ¹ýÒÔÏÂÏÂÁîÉó²é£º

$ git diff --name-only --diff-filter=U

µÇ¼ºó¸´ÖÆ

ÆäÖÐ –name-only ²ÎÊýÌåÏÖÖ»ÏÔʾÎļþÃû £¬–diff-filter=U ²ÎÊýÌåÏÖÏÔʾ³åÍ»Îļþ¡£

½â¾ö³åÍ»

ͨ¹ýÉó²é³åÍ»Îļþ £¬ÎÒÃÇ¿ÉÒÔÖªµÀÄÄЩÎļþ±£´æ³åÍ»¡£½ÓÏÂÀ´ £¬ÎÒÃÇÐèÒªÊÖ¶¯È¥½â¾ö³åÍ»¡£

Ê×ÏÈ £¬ÎÒÃÇÐèÒª·­¿ª±£´æ³åÍ»µÄÎļþ £¬ÏêϸµÄ³åͻλÖûáÓÃÌØÊâµÄ·ûºÅ±ê¼Ç³öÀ´ £¬ÀýÈ磺

>>>>>> branch_name

µÇ¼ºó¸´ÖÆ

>>>>>> branch_name Ö®¼äÌåÏÖÔ¶³ÌÐ޸ĵÄÄÚÈÝ¡£

ÎÒÃÇÐèҪƾ֤ÏÖÕæÏàÐÎÑ¡Ôñ±£´æÄÄÒ»²¿·Ö»òÕß¾ÙÐÐÊÖ¶¯ºÏ²¢¡£ºÏ²¢Íê³Éºó £¬ÔÙ´ÎÌá½»Ð޸ļ´¿É½â¾ö³åÍ»¡£

Ìá½»½â¾ö¼Æ»®

µ±³åÍ»½â¾öÍê³Éºó £¬ÎÒÃÇÐèҪͨ¹ýÒÔÏÂÏÂÁîÌá½»½â¾ö¼Æ»®£º

$ git add <file_name>
$ git commit</file_name>

µÇ¼ºó¸´ÖÆ

ÆäÖÐ ÊDZ£´æ³åÍ»µÄÎļþÃû¡£

Éó²éÌá½»ÀúÊ·

×îºó £¬ÎÒÃÇ¿ÉÒÔͨ¹ýÒÔÏÂÏÂÁîÉó²éÌá½»ÀúÊ·£º

$ git log

µÇ¼ºó¸´ÖÆ

ÈôÊÇÏÔʾ Merge branch ‘ ‘ £¬Ôò˵Ã÷³åÍ»ÒѾ­Àֳɽâ¾ö¡£

×ܽá

ÔÚÍŶÓЭ×÷ÖÐ £¬³åÍ»Êdz£¼ûµÄÎÊÌ⡣ͨ¹ýÉÏÊöÏÈÈÝ £¬ÎÒÃÇ¿ÉÒÔÔÚ Git ÖÐÏàʶÔõÑùÉó²é³åÍ»¡¢½â¾ö³åÍ»²¢Ìá½»½â¾ö¼Æ»®¡£ÔÚÏÖʵ¿ª·¢ÖÐ £¬ÊµÊ±µÄ½â¾ö³åÍ»¿ÉÒÔÌá¸ßÍŶÓЭ×÷ЧÂÊ £¬¸üºÃµÄÍƽøÏîÄ¿Ï£Íû¡£

ÒÔÉϾÍÊÇÏê½âgitÖÐÔõôÉó²é³åÍ»µÄÏêϸÄÚÈÝ £¬¸ü¶àÇë¹Ø×¢±¾ÍøÄÚÆäËüÏà¹ØÎÄÕ£¡

ÃâÔð˵Ã÷£ºÒÔÉÏչʾÄÚÈÝȪԴÓÚÏàÖúýÌå¡¢ÆóÒµ»ú¹¹¡¢ÍøÓÑÌṩ»òÍøÂçÍøÂçÕûÀí £¬°æȨÕùÒéÓë±¾Õ¾ÎÞ¹Ø £¬ÎÄÕÂÉæ¼°¿´·¨Óë¿´·¨²»´ú±í×ðÁú¿­Ê±¹ÙÍøµÇ¼ÂËÓÍ»úÍø¹Ù·½Ì¬¶È £¬Çë¶ÁÕß½ö×ö²Î¿¼¡£±¾ÎĽӴýתÔØ £¬×ªÔØÇë˵Ã÷À´ÓÉ¡£ÈôÄúÒÔΪ±¾ÎÄÇÖÕ¼ÁËÄúµÄ°æȨÐÅÏ¢ £¬»òÄú·¢Ã÷¸ÃÄÚÈÝÓÐÈκÎÉæ¼°ÓÐÎ¥¹«µÂ¡¢Ã°·¸Ö´·¨µÈÎ¥·¨ÐÅÏ¢ £¬ÇëÄúÁ¬Ã¦ÁªÏµ×ðÁú¿­Ê±¹ÙÍøµÇ¼ʵʱÐÞÕý»òɾ³ý¡£

Ïà¹ØÐÂÎÅ

ÁªÏµ×ðÁú¿­Ê±¹ÙÍøµÇ¼

18523999891

¿É΢ÐÅÔÚÏß×Éѯ

ÊÂÇéʱ¼ä£ºÖÜÒ»ÖÁÖÜÎå £¬9:30-18:30 £¬½ÚãåÈÕÐÝÏ¢

QR code
ÍøÕ¾µØͼ