
第8ç« ãã©ã³ã
ãã©ã³ãã®æŠå¿µã¯ããã»ã©åçŽã§ã¯ãããŸããã äœæ¥ãã£ã¬ã¯ããªã®ãã¡ã€ã«ã«å€ãã®å€æŽãå ããå¿ èŠããããšæ³åããŠãã ããããããããã®å®éšçãªäœæ¥ã¯ããã¹ãŠãããŸããããšããäºå®ã§ã¯ãããŸããã äœæ¥ãå®äºãããŸã§ãå€æŽãä»ã®åŸæ¥å¡ã«èŠããããªãã§ãããã ãã¶ããããŸã§äœãã³ãããããªãã®ã§ããããïŒ ããã¯æªããªãã·ã§ã³ã§ãã é »ç¹ãªã³ããããšããã·ã¥ãäœæ¥ã®å®å šæ§ã®éµã§ãããå€æŽã®å±¥æŽã確èªããæ©äŒã§ããããšã¯ãã§ã«ããã£ãŠããŸãã 幞ããªããšã«ãGitã«ã¯ãã©ã³ãã¡ã«ããºã ããããã³ããããšããã·ã¥ã¯å¯èœã§ãããä»ã®åŸæ¥å¡ã«ã¯å¹²æžããŸããã
å®éšçãªå€æŽãéå§ããåã«ããã©ã³ããäœæããå¿ èŠããããŸãã ãã©ã³ãã«ã¯ååããããŸãã ãããç§ã®ãã¹ãã¯ãŒã¯ãšåŒã³ãŸãããã ããã§ããã¹ãŠã®ã³ããããããã«æ£ç¢ºã«ç§»åããŸãã ãã®åã«ã圌ãã¯ã¡ã€ã³ã®éçºãã©ã³ãã«è¡ããŸãã-ããããã¹ã¿ãŒãšåŒã³ãŸãã èšãæããã°ãããªãã¯ãã¹ã¿ãŒãã©ã³ãã«ããŸããïŒãããç¥ããªãã£ããšããŠãïŒããä»ã¯ãã¹ãäœæ¥ãã©ã³ãã«åãæ¿ããŸããã 次ã®ããã«ãªããŸãã

ã³ãããã3ãã®åŸããã©ã³ããäœæãããæ°ããã³ãããã4ããšã5ããããã«è¡ããŸããã ãããŠãããªãã®ååã¯masterãã©ã³ãã«æ®ã£ãŠããã®ã§ãæ°ããã³ãããã6ããã7ããã8ããmasterãã©ã³ãã«è¿œå ãããŸãã æŽå²ã¯ç·åœ¢ã§ã¯ãªããªããŸããã
ããã¯äœã«åœ±é¿ããŸãããïŒ åŸæ¥å¡ã«ã¯ãäœæãããã¡ã€ã«ã®å€æŽã衚瀺ãããªããªããŸãã ãŸããäœæ¥ãã¡ã€ã«ã«ãããã®å€æŽã¯è¡šç€ºãããŸããã ããã§ããmasterãã©ã³ãã®å€æŽã®å±¥æŽãèŠãããšãã§ããŸãã
ã ãããä»ãããªãã¯èª°ã«ãéªéãããããšãªããããªãèªèº«ã®å®éšçãªä»äºãããããšãã§ããŸãã ãã®çµæãããªãã«åããªãå Žåã¯ãåçŽã«ãã¹ã¿ãŒãã©ã³ãã«åãæ¿ããŸãïŒæåŸã®ã³ããã-å³ã§ã¯ããã¯ã³ãããã8ãã§ãïŒã åãæ¿ãæã«ã¯ãäœæ¥ãã©ã«ããŒå ã®ãã¡ã€ã«ã¯ååãšåãã«ãªããå€æŽã¯æ¶ããŸãã ããã§ãäœæ¥ã³ããŒãã³ãããã8ãããã®ãã£ã¹ãã«ãªããŸããã åçã¯ãmy test workãã©ã³ãã§è¡ã£ãå€æŽããªãããšã瀺ããŠããŸãã
第9ç« ãã©ã³ãã®ããŒãž
ããã§ã誰ã§ããã©ã³ããäœæããç¬ç«ããŠäœæ¥ã§ããããšãããããŸããã ãããã©ã³ãã§äœæ¥ããŠãããå¥ã®ãã©ã³ãã§äœæ¥ããããšãã§ããŸã-ããããåãæ¿ããŸãã ãã©ã³ãã¯ãcheckoutã³ãã³ãã«ãã£ãŠåãæ¿ããããŸãã
ãã©ã³ãã¯ãäžæçãªç¬ç«ããäœæ¥ã ãã§ãªã䜿çšãããŸãã å€ãã®å Žåãã²ãŒã ã®ããã€ãã®ããŒãžã§ã³ãåæã«æºåããŸãã ããšãã°ãããããŒãžã§ã³ã¯ã»ãšãã©å ¬éã®æºåãã§ããŠãããããã°ã©ããŒã¯ææ°ã®ä¿®æ£ãå ããŠããŸãã åæã«ãã²ãŒã ãã¶ã€ããŒã¯ãã§ã«æ¬¡ã®ã¢ããããŒãã«åãçµãã§ããŸãã 次ã®çç±ã«ããã以åã®ããŒãžã§ã³ã§ã¯åäœããŸããã
- ãããã®å€æŽã¯çŸåšã®ããŒãžã§ã³ã«ã¯è¡šç€ºãããŸããã
- å€æŽã¯äœããå£ãå¯èœæ§ããããããããŒãžã§ã³ãå ¬éããåã«ãã§ããã ãå°ãªãå€æŽãå ããå¿ èŠããããŸãã
ã€ãŸãããã©ã³ãã«ã¯å€ãã®å©ç¹ããããŸãã ãã ããå®éšçãªäœæ¥ã®äŸã«æ»ããŸãã åã®ç« ã§ãç§ãã¡ã¯åœŒå¥³ã倱æãããšæ±ºããŸããã ãã¹ã¿ãŒãã©ã³ãã«æ»ãããã¹ãäœæ¥ãã©ã³ãã§è¡ã£ãå€æŽã倱ããŸããã ãããŠããã¹ãŠãããŸããã£ããïŒ å€æŽãmasterãã©ã³ãã«è»¢éããŠãããã䜿çšãã人ã ãããããèŠãããšãã§ããããã«ããŸãã Gitã¯åœ¹ç«ã¡ãŸã-masterãã©ã³ãã§my test workãã©ã³ãã®mergeã³ãã³ããå®è¡ããŸãïŒ

ããã§ãã³ããã "8"ã¯merge-commitãšåŒã°ããç¹å¥ãªã³ãããã§ãã mergeã³ãã³ããå®è¡ãããšãã·ã¹ãã ã¯ãã®ã³ãããèªäœãäœæããŸãã ã³ãããã5ããã6ããã7ãããã®ååã®å€æŽãšãã³ãããã3ããã4ãããã®äœæ¥ãçµã¿åãããŸãã
ã³ãããã1ããšã2ãããã®å€æŽã¯ããã©ã³ãã®äœæåã«è¡ããããããããŒãžããå¿ èŠã¯ãããŸããã ãã®ãããæåã¯masterãã©ã³ããšmy test workãã©ã³ãã®äž¡æ¹ã«ãããŸããã
mergeã³ãã³ãã¯ãäœãoriginã«éä¿¡ããŸããã ãã®å¯äžã®çµæã¯ãããŒãžã³ãããïŒå³ã®çªå·8ã®åïŒã§ãããã³ã³ãã¥ãŒã¿ãŒã«è¡šç€ºãããŸãã éåžžã®ã³ããããšåæ§ã«å®è¡ããå¿ èŠããããŸãã ãã®merge-commitãèµ·ç¹ã«ãªã£ãåŸã«ã®ã¿-ååã¯ãã«ã«ãã£ãŠããªãã®äœæ¥ã®çµæãèŠãã§ãããã
第10ç« ãã©ã³ãAãããã©ã³ãBãžã®ããã€ãã®ããŒãž
åã®ç« ã§ã¯ãæ°ãããã©ã³ããäœæããããã§äœæ¥ããã¡ã€ã³ãã©ã³ãã«å€æŽãã¢ããããŒãããæ¹æ³ãåŠã³ãŸããã ããŒãžåŸã®å³ã§ã¯ããã©ã³ããããŒãžãããŠããŸãã ããã¯ãç§ã®ãã¹ãäœæ¥ãã©ã³ãã§äœæ¥ã§ããªãããšãæå³ããŸã-æ¢ã«masterãšããŒãžãããŠããŸããïŒ ãããããã¹ãäœæ¥ãã©ã³ãã«åŒãç¶ãã³ãããããã¡ã€ã³ãã©ã³ãã«å®æçã«ããŒãžã§ããŸãã ããã¯ã©ã®ããã«èŠããŸããïŒ

ãã©ã³ããæ¥ç¶ããã»ã°ã¡ã³ãã¯æ°Žå¹³ã§ã¯ãªãããšã«æ³šæããŠãã ãã-ã©ã®ãã©ã³ãããã©ã®ããŒãžã«ç§»è¡ãããã衚瀺ãããŸãã ãã®ç¶æ³ã§ã¯ã2ã€ã®ããŒãžããããäž¡æ¹ãšãå³ãã©ã³ãããå·Šãžã®ããŒãžããããŸããã æåã®ããŒãžã®çµæã¯merge-commit "7"ã§ã2çªç®ã¯merge-commit "10"ã§ããã ããšãã°ãããŒãžã¯å³ãã©ã³ãããå·Šã«åãã£ãŠè¡ãããããããã£ã¹ãã8ãã§ã¯ãã³ãããã3ãã§è¡ãããå€æŽããããŸãã ãã ãããã£ã¹ãã11ãã§ã¯ãã³ãããã5ãã§è¡ãããå€æŽã¯ãããŸããã ãã®çç±ãå¿ ãç解ããŠãã ããã ããã§ãªãå Žåã¯ããã©ã³ãã®ç« ãããäžåºŠèªã¿çŽããŠãã ããã
第11ç« äž¡åŽã®ãã©ã³ãéã®ããŒãž
åã®äŸã§ã¯ããã¹ãäœæ¥ãã©ã³ããããã¹ã¿ãŒãã©ã³ããŸã§åžžã«ããŒãžãç¶ããŸããã å察æ¹åã«ããŒãžããããšã¯å¯èœã§ããïŒããã«ã¯æå³ããããŸããïŒ ã§ããŸãã ãããŸãã
ãã©ã³ãã§é·ãéäœæ¥ããŠããå Žåãã¡ã€ã³ãã©ã³ãããå®æçã«ããŒãžããããšããå§ãããŸãã ããã¯ãä»ã®äººãå€æŽãããã¡ã€ã«ã®çŸåšã®ããŒãžã§ã³ã§äœæ¥ããããã«å¿ èŠã§ãã ããã¯ã©ã®ããã«èŠããŸããïŒ

my test workãã©ã³ãããmasterãã©ã³ããžã®2ã€ã®ããŒãžãšãå察æ¹åãžã®1ã€ã®ããŒãžããããŸãã éçµåã®çµæã¯ãããŒãžã³ããã "8"ã§ããã ããšãã°ã圌ã®ãããã§ãã³ããã "11"ã®ãã£ã¹ãã«ã¯ãã³ããã "7"ããã®å€æŽãå«ãŸããŠããŸãã ãã ãããã®ã³ãããã¯ããŒãžåŸã«è¡ããããããã11ããã£ã¹ãã®ã9ãã³ãããããã®å€æŽã¯ãããŸããã
第12ç« ã³ããããšãã®ããã·ã¥
gitã¯ã³ããããã©ã®ããã«åºå¥ããŸããïŒ ç°¡åã«ããããã«ãåçã§ã¯ã·ãªã¢ã«çªå·ãä»ããŸããã å®éãGitã®ãã¹ãŠã®ã³ãããã¯æ¬¡ã®è¡ã§ç€ºãããŸãã
e09844739f6f355e169f701a5b7ae02c214d5fb0
ãããã¯ãGitãäœæããããšãã«èªåçã«ä»äžããã³ãããã®ãååãã§ãã äžè¬ã«ããã®ãããªæååã¯äžè¬ã«ãããã·ã¥ããšåŒã°ããŸãã åã³ãããããã·ã¥ã¯ç°ãªããŸãã ç¹å®ã®ã³ãããã«ã€ããŠèª°ãã«äŒãããå Žåã¯ããã®ã³ãããã®ããã·ã¥ããã®äººã«éä¿¡ã§ããŸãã ããã·ã¥ãç¥ã£ãŠããã°ã圌ã¯ãã®ã³ããããèŠã€ããããšãã§ããŸãïŒãããããªãã®ã³ããããªãããã¡ãããæåã«ãããå®è¡ããªããã°ãªããŸããïŒã
第13ç« ãã©ã³ããšã€ã³ããã¯ã¹
次ã«ãGitããã©ã³ãæ å ±ãä¿åããæ¹æ³ã«ã€ããŠããå°ã詳ãã説æããŸãã Gitã®å éšããã€ã¹ã¯å¿é ããå¿ èŠã¯ãªãããã§ãããããã«ãããGitã§æäœãå®è¡ãããšäœãèµ·ããããããããç解ã§ããŸãã ãããŠãããªãã¯ãå€ãã®ééããé¿ããããšãã§ããŸãã
ããã€ã³ã¿ãŒãã®æŠå¿µãç解ããŸãããã ç°¡ç¥åããã圢åŒã§ã¯ããã€ã³ã¿ãŒã¯ãã®ååãšããã·ã¥ã§æ§æãããŸãã ãã€ã³ã¿ãŒã®äŸã次ã«ç€ºããŸãã
ãã¹ã¿ãŒ-e09844739f6f355e169f701a5b7ae02c214d5fb0
ããªãã¯èšãïŒããã¹ã¿ãŒã¯ããªãã¿ã®ååã§ãïŒ ããããã¡ã€ã³ã¯ãŒãã³ã°ãã©ã³ããã ãããŠããã®å¶ç¶ã¯å¶ç¶ã§ã¯ãããŸããã Gitã¯ãã€ã³ã¿ãŒã䜿çšããŠåå²ã瀺ããŸãã ã¢ã€ãã¢ã¯ç°¡åã§ããæ°ãããã©ã³ããå¿ èŠãªå ŽåãGitã¯æ°ãããã€ã³ã¿ãŒãäœæãããã©ã³ãã®ååãä»ããŠããã©ã³ãã®æåŸã®ïŒææ°ã®ïŒã³ãããã®ããã·ã¥ãæžã蟌ã¿ãŸãã ãã©ã³ããäœæãããŸããïŒ
ãã€ã³ã¿ãŒå ã®ããã·ã¥ã®ãããã§ããã€ã³ã¿ãŒã¯ãã©ã³ãã®æåŸã®ã³ããããåç §ãŸãã¯ããã€ã³ããããŠãããšèšããŸãã Gitããã©ã³ãã§ãã¹ãŠã®æäœãå®è¡ããã«ã¯ãããã§ååã§ãã ã€ãŸããã©ã®ã³ããããã©ã®ãã©ã³ãã«å±ããŠãããã«é¢ããä»ã®æ å ±ã¯ãGitãä¿åããªããã©ã³ãã§ãã ããã¯ã©ãã ããããã«ã§ãã
åãã©ã³ãã«ã¯ç¬èªã®ãã€ã³ã¿ãŒããããŸãã 次ã®ã³ãããããã©ã³ãã«è¿œå ããããšããã€ã³ã¿ãŒã®ããã·ã¥ã¯æåŸã®ã³ããããåã³ãæããããã«å€ãããŸãã ããã¯ãæåŸãã2çªç®ã®ã³ããããžã®ãã©ã³ããã€ã³ã¿ãŒã®ã·ãããšããŠè¡šãããšãã§ããŸãã
Gitã«å¥ã®ãã©ã³ããžã®åãæ¿ããèŠæ±ããå ŽåïŒcheckoutã³ãã³ãïŒããã®ãã©ã³ãã®ååãæã€ãã€ã³ã¿ãŒãèŠã€ããŠãããããæåŸã®ã³ãããã®ããã·ã¥ãååŸããã ãã§ååã§ãã Gitã¯ãäœæ¥ãã£ã¬ã¯ããªãã¡ã€ã«ãã©ã®ããã«èŠããããç¥ã£ãŠããŸãïŒãã®ã³ãããã®ãã£ã¹ãã®ããã«ïŒã Gitã¯ãã¡ã€ã«ããã®åœ¢åŒã«ããŸã-ãã©ã³ããžã®åãæ¿ããçºçããŸããã
ãã€ã³ã¿ã®æŠå¿µãšããããããã©ã³ãã«ã©ã®ããã«é¢ä¿ããããããç解ããŠããªãå Žåã¯ããã®ç« ãããäžåºŠèªã¿çŽããŠãã ããã Gitã¯ãã€ã³ã¿ãŒãšå€ãã®é¢ä¿ããããããäœæ¥ã®ä»çµã¿ãæ確ã«ç解ããããšãéèŠã§ãã 幞ããªããšã«ãããã¯ãŸã£ããè€éã§ã¯ãªããå°ãçããã§ãã æ £ããã ãã§ãã
第14ç« ããããã€ã³ã¿ãŒ
ãã®ããããã€ã³ã¿ãŒã¯ååãæã€ãã®ã§ãããç¹å®ã®ã³ããããåç §ããïŒãã®ããã·ã¥ãä¿åããïŒããšãç¥ã£ãŠããŸãã æ°ãããã©ã³ããå¿ èŠãªå ŽåãGitã¯æåŸã®ã³ããããžã®ãã€ã³ã¿ãŒãäœæããæ°ããã³ãããããšã«ãããåæ¹ã«ç§»åããããšãç¥ã£ãŠããŸãã
ãã€ã³ã¿ãŒã¯ãã©ã³ãã ãã§ãªã䜿çšãããŸãã ç¹å¥ãªããããã€ã³ã¿ãŒããããŸãã ã³ãããã瀺ããŸããããã¯äœæ¥ãã£ã¬ã¯ããªã®ç¶æ ã§ãã ããªãã¯ãã®èããç解ããŠããŸããïŒ ä»¥äžã«äŸã瀺ããŸãã

ããã«ã¯ããã¹ã¿ãŒãšãã¹ãã®2ã€ã®ãã€ã³ã¿ãŒã§è¡šããã2ã€ã®ãã©ã³ãããããŸãã ãã¹ã¿ãŒãã©ã³ãã«ãããäœæ¥ãã£ã¬ã¯ããªå ã®ãã¡ã€ã«ã¯ã³ãããã³ããããã²ããã4ãã«å¯Ÿå¿ããŠããŸãã ã©ããã£ãŠãããç¥ãã®ã§ããïŒ ããããã€ã³ã¿ãŒãã³ããã "4"ãæããŠãããšããäºå®ããã ããæ£ç¢ºã«ã¯ããã¹ã¿ãŒãã€ã³ã¿ãŒãæãããã¹ã¿ãŒãã€ã³ã¿ãŒã¯ã³ããã "4"ãæããŸãã ã³ãããã4ããçŽæ¥ãã€ã³ãããªãã®ã¯ãªãã§ããïŒ ãªããã€ã³ã¿ãŒãæããŠãããã®ãããªãã§ã€ã³ãã§ããïŒ ãããã£ãŠãGitã¯ãçŸåšmasterãã©ã³ãã«ããããšãæå³ããŸãã
ã³ãããã«ããããã€ã³ã¿ã眮ãããšãã§ããŸã-ããã«ã¯ãã§ãã¯ã¢ãŠãã³ãã³ãããããŸãã ãããã衚瀺ããã³ãããã§ãäœæ¥ãã£ã¬ã¯ããªå ã®ãã¡ã€ã«ã¯ãã®ç¶æ ã«ãªãããšãæãåºããŠãã ããïŒããã¯ããããã€ã³ã¿ãŒã®ããããã£ã§ãïŒã ãããã£ãŠãããããã€ã³ã¿ãŒãå¥ã®ã³ãããã«ç§»åããããšã«ãããGitã«äœæ¥ãã£ã¬ã¯ããªå ã®ãã¡ã€ã«ã匷å¶çã«å€æŽãããŸãã ããã¯ãããšãã°ãäœæ¥ãã¡ã€ã«ã®å€ãããŒãžã§ã³ã«ããŒã«ããã¯ããŠããã¹ãŠãããã«ãã£ãæ¹æ³ã確èªããããã«å¿ èŠã«ãªãå ŽåããããŸãã ãããŠããã¹ã¿ãŒïŒãã§ãã¯ã¢ãŠããã¹ã¿ãŒïŒãã©ã³ãã®æåŸã®ã³ãããã«æ»ãããšãã§ããŸãã ãã§ãã¯ã¢ãŠããã¹ããå®è¡ãããšïŒå³ãåç §ïŒãheadã¯ãã¹ããã€ã³ã¿ãŒããã€ã³ããããã¹ããã€ã³ã¿ãŒã¯ãã¹ããã©ã³ãã®æåŸã®ã³ãããããã€ã³ãããŸãã äœæ¥ãã£ã¬ã¯ããªå ã®ãã¡ã€ã«ã¯ã6ããã²ããã«å€æŽãããŸãã ããã§ããã¹ããã©ã³ãã«åãæ¿ããŸããã
ãŸãšãããšã ç¹å¥ãªãã€ã³ã¿ãããã®çœ®æã«ãããäœæ¥ãã£ã¬ã¯ããªå ã®ãã¡ã€ã«ããã®ã³ãããã®ãã²ããã«å€æŽãããŸãã ããããheadãäœããã®ãã©ã³ããžã®ãã€ã³ã¿ãŒãæããŠããå Žåã«ã®ã¿ãGitã¯ãã®ãã©ã³ãã«ãããšèŠãªããŸãã
ãããŠãheadãçŽæ¥ã³ãããïŒããã·ã¥ãä¿åïŒãæããšã©ããªããŸããïŒ ãã®ç¶æ ã¯åé¢ããããšåŒã°ããŸãã ããã«ãã°ããåãæ¿ããŠãäœæ¥ãã£ã¬ã¯ããªã®ãã¡ã€ã«ãéå»ã®ã³ãããã®1ã€ãã©ã®ããã«èŠãŠãããã確èªã§ããŸãã
åãæ¿ãïŒãã©ã³ãéããã³éåžžã®ã³ãããéïŒã¯ãcheckoutã³ãã³ãã«ãã£ãŠå®è¡ãããŸãã
第15ç« ãªãªãžã³ãªãªãžã³/ãã¹ã¿ãŒ
ãªã¢ãŒããªããžããªïŒãªãªãžã³ïŒã¯ç§ãã¡ã®ãã®ãšåããªã®ã§ãããã«ããã©ã³ããã€ã³ã¿ãŒããããŸããïŒ ããã ãã ããšãã°ããã®ã¹ã¬ããã®ææ°ã®ã³ããããåç §ãããã¹ã¿ãŒãã€ã³ã¿ãŒããããŸãã
èå³æ·±ãããšã«ãpullã³ãã³ãã䜿çšããŠå ããæ°ããã³ããããååŸãããšãããããã®ãã€ã³ã¿ãŒã®ã³ããŒãã³ããããšãšãã«ããŠã³ããŒããããŸãã ãã€ã³ã¿ãŒãã¹ã¿ãŒãšoriginããããŠã³ããŒããããã®ãæ··åããªãããã«ã2çªç®ã®ãã€ã³ã¿ãŒã¯ããã§origin / masterãšããŠè¡šç€ºãããŸãã origin / masterã¯ããªã¢ãŒããªããžããªã®ãã¹ã¿ãŒãã€ã³ã¿ãŒã®çŸåšã®ç¶æ ã衚瀺ããããã§ãããŸãã¯ãã«ã³ãã³ããå®è¡ãããæç¹ã§ã®ã³ããŒã®ã³ããŒã«éããªãããšãç解ããå¿ èŠããããŸãã
masterãšorigin / masterã¯ç°ãªãã³ããããæãå ŽåããããŸãã åçãèŠããšããæ確ã«ãªããŸãã

ããã¯ãïŒpullã³ãã³ãã䜿çšããŠïŒæ°ããã³ããããååŸãã2ã€ã®æ°ããã³ããããäœæãããããŸã ããã·ã¥ããŠããªãç¶æ³ã瀺ããŠããŸãã ãã®çµæãããŒã«ã«ãã¹ã¿ãŒã¯æåŸã®ã³ãããããã€ã³ãããŸãã ãããŠãorigin / masterã¯ããªã¢ãŒããªããžããªããååŸãããã€ã³ã¿ãŒã®æåŸã®ç¶æ ã§ãã ãããã£ãŠã圌ã¯ãé ããŸãããã
ããã·ã¥ã³ãã³ãã®åŸã2ã€ã®äžäœã³ãããã¯ãªãªãžã³ã«ç§»åãããªãªãžã³/ãã¹ã¿ãŒãäžã«ç§»åãããã¹ã¿ãŒã®ããã«æåŸã®ã³ããããæãããšã¯è«ççã§ãã
ãªãªãžã³/ãã¹ã¿ãŒã¯éã«é«ãããã¹ã¿ãŒã¯äœããããããŸãããïŒ ãã¶ãã æ¹æ³ã¯æ¬¡ã®ãšããã§ãã pullã³ãã³ãã¯æ°ããã³ããããååŸããããã«äœæ¥ãã£ã¬ã¯ããªã«é 眮ããŸãã pullã³ãã³ãã®çŽåŸã«ãorigin / masterãšmasterã®äž¡æ¹ãåãæåŸã®ã³ãããããã€ã³ãããŸãã ãããããã§ããã³ãã³ãããããŸãã ãã«ã®ããã«ã圌女ã¯å ããææ°ã®ã³ããããããŠã³ããŒãããŸãããäœæ¥ãã£ã¬ã¯ããªãæŽæ°ããã®ã¯æ¥ãã§ããŸããã ã°ã©ãã£ã«ã«ã«ã¯ã次ã®ããã«ãªããŸãïŒã³ããããããŠããªãã³ãããããªãå ŽåïŒïŒ

ãã§ããã³ãã³ãã®åã«ããã¹ã¿ãŒãã€ã³ã¿ãŒã¯ã³ããã "3"ãæããŠãããããããªããžããªã®æåŸã®ã³ãããã§ããã ååŸåŸã2ã€ã®æ°ããã³ãããã4ããšã5ããããŠã³ããŒããããŸããã ãªã¢ãŒããªããžããªã§ã¯ããã¹ã¿ãŒãã€ã³ã¿ã¯æããã«ã³ãããã5ããæããŠããŸããã ãã®ãã€ã³ã¿ã¯ã³ããããšãšãã«ããŠã³ããŒããããçŸåšã§ã¯ã5ããæããªãªãžã³/ãã¹ã¿ãŒãšããŠè¡šç€ºãããŠããŸãã ãã¹ãŠãè«ççã§ãã
ãªããã§ãããå¿ èŠãªã®ã§ããããïŒ ããšãã°ãäœæ¥ãã£ã¬ã¯ããªã®ç¶æ ãå€æŽããæºåã¯ã§ããŠããŸããããååãããã§ã³ãããããå 容ã確èªãããã ãã§ãã ãã§ãããè¡ããã³ãããã調ã¹ãŸãã æºåãã§ããããmergeã³ãã³ããå®è¡ããŸãã 以åã«ããŠã³ããŒãããã³ããããäœæ¥ãã£ã¬ã¯ããªã«é©çšããŸãã
ãã®åçŽãªäŸã§ã¯ãã³ããããããŠããªãã³ãããããªããããããŒãžã§ã¯äœãããŒãžããå¿ èŠã¯ãããŸããã ãã¹ã¿ãŒãšããããã€ã³ã¿ãŒãåçŽã«ç§»åããŸã-ããã§ãã³ãããã5ãã衚瀺ãããŸãã ãªãªãžã³/ãã¹ã¿ãŒã®ããã«ã
èšèŒãããã¡ã«ããºã ã«ã¯æ¬åœã«è€éãªãã®ã¯äœããªãããšã«æ°ä»ããããããŸããã æ éã«ç解ããªããã°ãªããªã詳现ã¯ãããããããŸãã ããããGitã¯ãã®ãããªãã®ã§ãã
èšäºã®æåŸã®éšåã§ã¯ããã©ã³ãã®ç±æ¥ãããã·ã¥ããšã©ãŒãã¹ããŒããçç±ããªããŒã¹ãšã¯äœãã«ã€ããŠèª¬æããŸãã ãããŠãã¡ãããèŠçŽããŸãã
â GitïŒåå¿è åãã®ãã³ã-ããŒã1
â GitïŒåå¿è åãã®ãã³ã-ããŒã2
â GitïŒåå¿è åãã®ãã³ã-ããŒã3