ããã§ã¢ã«ãŠã³ããçšæã§ããã®ã§ã次ã¯ãæ¢åã®ãããžã§ã¯ããžã®è²¢ç®ã«ããã£ãŠåœ¹ç«ã€ã§ãããããšã説æããŠãããŸãããã
æ¢åã®ãããžã§ã¯ãã«è²¢ç®ãããããã©ãããã®ãªããžããªã«ããã·ã¥ããæš©éããªããšããå Žåã¯ããããžã§ã¯ããããã©ãŒã¯ãã§ããŸãã ããã©ãŒã¯ããããšã¯ãGitHub ãããªãå°çšã«ãã®ãããžã§ã¯ãã®ã³ããŒãäœããšããããšã§ããããªãèªèº«ã®åå空éã«çœ®ãããã®ã§ãããã«ã¯èªåã§ããã·ã¥ã§ããŸãã
Note
|
æŽå²çã«ããã®ããã©ãŒã¯ããšããçšèªã¯ããŸã奜ãŸãããªãæå³ã§äœ¿ãããŠããŸããã äœãã®ãªãŒãã³ãœãŒã¹ãããžã§ã¯ãã®æ¹éãæ°ã«å ¥ããªã人ããå¥ã®éãæ©ã¿åºãããš ïŒãããŠæã«ã¯ã競åãããããžã§ã¯ããäœã£ãŠãè²¢ç®è ãåŒãæããŠããŸãããšïŒãæããŠããã®ã§ãã GitHub ã«ãããããã©ãŒã¯ããšã¯ãåã«ããªãã®é äžã«äœãããã³ããŒä»¥å€ã®äœè ã§ããããŸããã èªåèªèº«ã«ããå€æŽãå ¬éã®å Žã§ãã®ãããžã§ã¯ãã«é©çšã§ãããããªãŒãã³ãªããããã§ãããžã§ã¯ãã«è²¢ç®ã§ããããã«ããããã®æ段ãªã®ã§ãã |
ãã®æ¹åŒãªããååããŠããã人ãã¡ã«ãã¡ãã¡ããã·ã¥ã¢ã¯ã»ã¹æš©ãä»äžããŠããå¿ èŠã¯ãããŸããã ããããããããžã§ã¯ãããã©ãŒã¯ããŠãããã«ããã·ã¥ããŠããã®å€æŽãå ã®ãªããžããªã«æäŸããããã°ãããããããã«ãªã¯ãšã¹ãããäœãã°ããã®ã§ãã ãã«ãªã¯ãšã¹ãã«ã€ããŠã¯ãåŸã»ã©èª¬æããŸãã ãã«ãªã¯ãšã¹ããäœããšãããã«ã³ãŒãã¬ãã¥ãŒã®ã¹ã¬ãããç«ã¡äžãããŸãã ãããžã§ã¯ãã®ãªãŒããŒãšãã«ãªã¯ãšã¹ãã®äœè ã¯ãããã§å€æŽã«ã€ããŠã®è°è«ãéããŠã ãªãŒããŒãçŽåŸããæç¹ã§ããããããŒãžããããšãã§ããŸãã
ãããžã§ã¯ãããã©ãŒã¯ããã«ã¯ããããžã§ã¯ãã®ããŒãžã«è¡ã£ãŠãããŒãžå³äžã«ãã``Fork''ãã¿ã³ãæŒããŸãã
æ°ç§åŸãæ°ãããããžã§ã¯ãã®ããŒãžã«èªåçã«ç§»åããŸããããã¯ãããªãèªèº«ãæžã蟌ã¿å¯èœãªã³ããŒã§ãã
GitHub ã¯ããã«ãªã¯ãšã¹ããäžå¿ãšããã³ã©ãã¬ãŒã·ã§ã³ã®ã¯ãŒã¯ãããŒãæ³å®ããŠäœãããŠããŸãã ã²ãšã€ã®ãªããžããªãå ±æããå¯æ¥ã«é£æºããããŒã ã§ã®äœæ¥ã§ãã£ãŠããäžçäžã«åºããäŒæ¥ãå人ãé¢ãããããžã§ã¯ãã§äœåãã®ãã©ãŒã¯ããããããžã§ã¯ãã§ãã£ãŠãã ãã®ã¯ãŒã¯ãããŒã¯ããŸãæ©èœããŸãã ãã®äžå¿ã«ãªãã®ããch03-git-branching.asc ã§ãšãããã ch03-git-branching.asc ã®ã¯ãŒã¯ãããŒã§ãã
å šäœçãªæµãã¯ã以äžã®ããã«ãªããŸãã
-
master
ãããããã¯ãã©ã³ããäœãã -
ããã«ããããžã§ã¯ãã®æ¹è¯ã«ã€ãªããã³ããããããã
-
ãã®ãã©ã³ãããèªåã® GitHub ãããžã§ã¯ãã«ããã·ã¥ããã
-
GitHub äžã§ãã«ãªã¯ãšã¹ããäœãã
-
è°è«ãéããå¿ èŠãªãããã«ã³ããããããã
-
ãããžã§ã¯ãã®ãªãŒããŒã¯ããã«ãªã¯ãšã¹ããããŒãžããïŒãããã¯ãããŒãžããã«éããïŒã
ããã¯åºæ¬çã«ãch05-distributed-git.asc ã§ãšãããããçµ±åãããŒãžã£ãŒåã®ã¯ãŒã¯ãããŒã§ãã ããããå€æŽã«ã€ããŠã®ãããšããã¬ãã¥ãŒãã¡ãŒã«ã§è¡ã代ããã«ãããã§ã¯ GitHub ã®ãŠã§ãããŒã¹ã®ããŒã«ã䜿ããŸãã
GitHub ã§å ¬éããŠãããªãŒãã³ãœãŒã¹ã®ãããžã§ã¯ãã«å¯ŸããŠããã®ãããŒã䜿ã£ãŠå€æŽãææ¡ããäŸãèŠãŠãããŸãããã
èªåã®Arduinoäžã§å®è¡ããã³ãŒããæ¢ããŠãããããŒã¯ãGitHub äžã«ãã°ãããããã°ã©ã ãããããšãçºèŠããŸããã ããã https://github.com/schacon/blink ã§ãã
ãã ãã²ãšã€åé¡ããããŸãããç¹æ» ã®ééãéãããã®ã§ãã1 ç§ããã«ç¶æ ãåãæ¿ããã®ã§ã¯ãªãã3 ç§ãããã¯éã眮ããããã®ã§ãã ããŠããã®ããã°ã©ã ãæ¹è¯ããŠããã®å€æŽãææ¡ããŠã¿ãŸãããã
ãŸãã¯ãå
ã»ã©èª¬æãã 'Fork' ãã¿ã³ãã¯ãªãã¯ããŠããã®ãããžã§ã¯ãã®ã³ããŒãæã«å
¥ããŸãã
ãã®äŸã§äœ¿ããŠãŒã¶ãŒå㯠`tonychacon'' ãšããŸããã€ãŸããã§ãããã£ãã³ããŒã¯ `https://github.com/tonychacon/blink
ãšãªããããããã¯ãã®ãããžã§ã¯ããå€æŽããŠãããŸãã
ãããããŒã«ã«ã«ã¯ããŒã³ããŠããããã¯ãã©ã³ããäœããã³ãŒããå€æŽããŠããã®å€æŽã GitHub ã«ããã·ã¥ããŸãããã
$ git clone https://github.com/tonychacon/blink (1)
Cloning into 'blink'...
$ cd blink
$ git checkout -b slow-blink (2)
Switched to a new branch 'slow-blink'
$ sed -i '' 's/1000/3000/' blink.ino (3)
$ git diff --word-diff (4)
diff --git a/blink.ino b/blink.ino
index 15b9911..a6cc5a5 100644
--- a/blink.ino
+++ b/blink.ino
@@ -18,7 +18,7 @@ void setup() {
// the loop routine runs over and over again forever:
void loop() {
digitalWrite(led, HIGH); // turn the LED on (HIGH is the voltage level)
[-delay(1000);-]{+delay(3000);+} // wait for a second
digitalWrite(led, LOW); // turn the LED off by making the voltage LOW
[-delay(1000);-]{+delay(3000);+} // wait for a second
}
$ git commit -a -m 'three seconds is better' (5)
[slow-blink 5ca509d] three seconds is better
1 file changed, 2 insertions(+), 2 deletions(-)
$ git push origin slow-blink (6)
Username for 'https://github.com': tonychacon
Password for 'https://[email protected]':
Counting objects: 5, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 340 bytes | 0 bytes/s, done.
Total 3 (delta 1), reused 0 (delta 0)
To https://github.com/tonychacon/blink
* [new branch] slow-blink -> slow-blink
-
ãã©ãŒã¯ãããããžã§ã¯ãããããŒã«ã«ã«ã¯ããŒã³ãã
-
ããããããååã®ãããã¯ãã©ã³ããäœã
-
ã³ãŒããå€æŽãã
-
åé¡ã¯ãªãããã
-
ãã®å€æŽããããã¯ãã©ã³ãã«ã³ããããã
-
æ°ãããããã¯ãã©ã³ãããGitHub äžã®ãã©ãŒã¯ã«æžãæ»ã
ãã®ç¶æ 㧠GitHub äžã®ãã©ãŒã¯ã«æ»ããšãGitHub äžã«æ°ãããããã¯ãã©ã³ããããã·ã¥ãããããšãäŒããŠãããŸãã ãŸãã倧ããªç·è²ã®ãã¿ã³ã䜿ãã°ãå€æŽç¹ã確èªããããå ã®ãããžã§ã¯ããžã®ãã«ãªã¯ãšã¹ããéã£ããã§ããŸãã
ãããã¯ãhttps://github.com/<user>/<project>/branches
ã«ãã ``Branches'' ããŒãžããèªåã®ãããã¯ãã©ã³ãã«ç§»åããŠããããããã«ãªã¯ãšã¹ããéãããšãã§ããŸãã
ãã®ç·ã®ãã¿ã³ãã¯ãªãã¯ãããšããã«ãªã¯ãšã¹ãã®ã¿ã€ãã«ãšèª¬æãå ¥åããç»é¢ã«é·ç§»ããŸãã ã¡ãããšæéããããŠèª¬æãæžããŸããããæã¯ããªãã¯ãã§ãããã«ãªã¯ãšã¹ããåããåŽã®ãããžã§ã¯ããªãŒããŒããããã°ã説ææããããã°ããªãã®æå³ãæ±²ã¿åãããããªãããã§ããããããã°ããªãŒããŒã¯ãã«ãªã¯ãšã¹ãã®å 容ãæ£ç¢ºã«è©äŸ¡ã§ããŸããããããåã蟌ãããšããããžã§ã¯ãã«ãšã£ãŠãã©ã¹ãã©ãããå€æã§ããã§ãããã
ãã®ç»é¢ã§ã¯ããããã¯ãã©ã³ãå ã®ã³ãããã®ãã¡ã`master`ãããå è¡ããŠããã³ãããã®äžèŠ§ (ä»åã®å Žåã¯ã²ãšã€ã ã) ã確èªã§ããŸãã ãŸãããã®ãã©ã³ãããªãŒããŒãããŒãžãããšãã«é©çšãããå€æŽã®ãunified圢åŒã®å·®åã衚瀺ãããŸãã
ãã®ç»é¢ã§ 'Create pull request' ãã¿ã³ãæŒããšããã©ãŒã¯å ã®ãããžã§ã¯ãã®ãªãŒããŒã«ã 誰ããå€æŽãææ¡ããŠãããšããéç¥ãå±ããŸãããã®éç¥ã«ã¯ãå€æŽã«é¢ãããã¹ãŠã®æ å ±ãèšèŒãããããŒãžãžã®ãªã³ã¯ãå«ãŸããŠããŸãã
Note
|
äžè¬ã«ãã«ãªã¯ãšã¹ãã¯ããããã£ãå ¬éãããžã§ã¯ãã«å¯Ÿããå€æŽãããã®æºåãæŽã£ãæç¹ã§ææ¡ããããã«äœããã®ã§ãã ããããå éšçãªãããžã§ã¯ãã®éçºãµã€ã¯ã«ã«ãããŠã éçºãå§ããã¿ã€ãã³ã°ã§ ãã«ãªã¯ãšã¹ããäœãããšããããããŸãã ãã«ãªã¯ãšã¹ããäœã£ã*åŸã§ã*ããã®ãããã¯ãã©ã³ããžã®ããã·ã¥ãç¶ããããšãã§ããŸãã æåŸã®æåŸã«ãã«ãªã¯ãšã¹ããè¡ãã®ã§ã¯ãªããæ©ãæç¹ã§ãã«ãªã¯ãšã¹ããäœã£ãŠããã°ã ãã®åŸã®äœæ¥ç¶æ³ãããŒã å ã§å ±æã§ããŸãã |
ããã§ãå ã®ãããžã§ã¯ãã®ãªãŒããŒã¯ãå€æŽã®ææ¡ãèŠãããããã«ãªããŸããããããããŒãžããããåŽäžããããã³ã¡ã³ããããããããšãã§ããŸãã ããã§ã¯ããªãŒããŒãå€æŽææ¡ãæ°ã«å ¥ã£ããã®ã®ãã©ã€ããæ¶ããŠããæéãç¹ç¯ããŠããæéãããå°ãã ãé·ãããã»ãããããšæããããšã«ããŸãããã
ch05-distributed-git.asc ã®ã¯ãŒã¯ãããŒãªãããã®æã®ãããšãã¯ã¡ãŒã«ã§è¡ããšããã§ãããGitHub ã®å Žåã¯ããããªã³ã©ã€ã³ã§è¡ããŸãã ãããžã§ã¯ãã®ãªãŒããŒã¯unfied diffãã¬ãã¥ãŒããŠãã³ã¡ã³ããæ®ããŸããã³ã¡ã³ããããè¡ãã¯ãªãã¯ããã°ãã³ã¡ã³ããæ®ããŸãã
ã¡ã³ãããã³ã¡ã³ããå ¥ãããšããã«ãªã¯ãšã¹ãã®äœè (ãããŠããã®ãªããžããªããŠã©ããããŠãããã¹ãŠã®äººãã¡) ã«ãéç¥ãå±ããŸãã éç¥ãã«ã¹ã¿ãã€ãºããæ¹æ³ã«ã€ããŠã¯åŸè¿°ããŸãããã¡ãŒã«ã§ã®éç¥ãåãåãããã«èšå®ããŠããå Žåã¯ã以äžã®ãããªã¡ãŒã«ãå±ããŸãã
ãªãŒããŒã ãã§ãªã誰ã§ãããã«ãªã¯ãšã¹ãå šäœã«å¯Ÿããã³ã¡ã³ããã§ããŸãã ãã«ãªã¯ãšã¹ãã®ãã£ã¹ã«ãã·ã§ã³ããŒãž ã§ã¯ããããžã§ã¯ãã®ãªãŒããŒãã³ãŒãã®ç¹å®ã®è¡ã«ã€ããŠã³ã¡ã³ãããããã§ãããã«ãã«ãªã¯ãšã¹ãå šäœã«é¢ããã³ã¡ã³ããæ®ããŠããŸãã ãŸããã³ãŒããžã®ã³ã¡ã³ãããäžé£ã®äŒè©±ã«çµã¿èŸŒãŸããŠããããšã«ããæ°ã¥ãã§ãããã
ãã«ãªã¯ãšã¹ãã®äœè ã¯ãèªåã®å€æŽãåãå ¥ããŠãããããã«äœãå¿ èŠãªã®ããããããŸããã 幞éã«ãããããªã«æéã®ãããããšã§ã¯ãããŸããã ã¡ãŒã«ã§ã®ãããšãã®å Žåã¯ãäžé£ã®äœæ¥ãããçŽããäžã§ããäžåºŠã¡ãŒãªã³ã°ãªã¹ãã«æçš¿ããå¿ èŠããããŸããã GitHub ãªããåã«ãããã¯ãã©ã³ãã«ã³ãããããŠãããããã·ã¥ããã ãã§æžã¿ãŸãã ãŸãããã«ãªã¯ãšã¹ãã®æçµåœ¢ ã«ããããã«ãæŽæ°ããããã«ãªã¯ãšã¹ãã§ã¯å€æŽåã®ã³ãŒããžã®ã³ã¡ã³ã衚瀺ãçç¥ãããŠããŸããè¿œå ãããã³ãããã«ãã£ãŠå€æŽãããã³ãŒããžã®ã³ã¡ã³ãã ããã§ãã
ãªããæ¢åã®ãã«ãªã¯ãšã¹ãã«ã³ããããè¿œå ããŠããéç¥ã¯éãããŸãããããã§ãä¿®æ£ãããã·ã¥ãããããŒã¯ãä¿®æ£ãçµãã£ãããšãã³ã¡ã³ãã§ãããžã§ã¯ããªãŒããŒã«äŒããããšã«ããŸããã
ãã®ãã«ãªã¯ãšã¹ãã®ããŒãžã§ Files Changed'' ã¿ããã¯ãªãã¯ãããšã
unified'' 圢åŒã® diff ã確èªã§ããŸãã
ã€ãŸãããã®ãããã¯ãã©ã³ããããŒãžãããšãã«ã©ããªå€æŽãæœãããã®ããããŸãšããŠç¢ºèªã§ããã®ã§ãã
git diff
ã®çšèªã«çŽããšããã®ã¿ããéãããšãã«è¡šç€ºãããå
容ã¯ããã«ãªã¯ãšã¹ãã®å¯Ÿè±¡ã«ãªã£ãŠãããã©ã³ãäžã§
git diff masterâŠâ<branch>
ãå®è¡ããçµæã«ãªããŸãã
ãã®åœ¢åŒã® diff ã«ã€ããŠã®è©³çŽ°ã¯ãch05-distributed-git.asc ãåç
§ãã ããã
ããã²ãšã€ãæ°ã¥ãã®ããšãããããšã§ãããã GitHub ã¯ããã®ãã«ãªã¯ãšã¹ããåé¡ãªãããŒãžã§ããããšã確èªããããã§ããµãŒããŒäžã§ããŒãžãå®è¡ããããã®ãã¿ã³ã衚瀺ããŸãã ãã®ãã¿ã³ã衚瀺ãããã®ã¯ãããªãããã®ãªããžããªãžã®æžã蟌ã¿ã¢ã¯ã»ã¹æš©éãæã£ãŠããŠããã€åé¡ãªãããŒãžå¯èœãªå Žåã ãã§ãã ãã®ãã¿ã³ãã¯ãªãã¯ãããšãGitHub 㯠``non-fast-forward'' ãªããŒãžãè¡ããŸãã ã€ãŸãã仮㫠fast-forward å¯èœãªããŒãžã§ãã£ããšããŠããæ瀺çã«ããŒãžã³ããããäœããŸãã
ãæã¿ãªãããã®ãã©ã³ããååŸããäžã§ãããŒã«ã«ã§ããŒãžããããšãã§ããŸãã
ãã®ãã©ã³ãã master
ã«ããŒãžããŠãã GitHub ã«ããã·ã¥ãããšããã®ãã«ãªã¯ãšã¹ãã¯èªåçã«éããããŸãã
ãããã倧åã® GitHub ãããžã§ã¯ãã䜿ã£ãŠããåºæ¬çãªã¯ãŒã¯ãããŒã§ãã ãããã¯ãã©ã³ããäœãããããããã«ãªã¯ãšã¹ããäœã£ãŠãè°è«ãéããå¿ èŠã«å¿ããŠããã«äœæ¥ãéããŠãæçµçã«ãã®ãªã¯ãšã¹ããããŒãžãããããããã¯ããŒãžããã«çµäºããŸãã
Note
|
ãã©ãŒã¯ããªããŠãããŸããªã
åããªããžããªã®ãµãã€ã®ãã©ã³ãéã§ã®ãã«ãªã¯ãšã¹ããã§ãããšããããšãç¥ã£ãŠãããŸãããã
誰ããšäžç·ã«äœããã®ãã£ãŒãã£ãŒã®äœæ¥ãããŠããŠãäž¡æ¹ãšããã®ãããžã§ã¯ããžã®æžã蟌ã¿æš©éãæã£ãŠããå Žåãªãã
ãããã¯ãã©ã³ãããã®ãªããžããªã«ããã·ã¥ããäžã§ãåããããžã§ã¯ãã® |
GitHub ã®ãããžã§ã¯ãã«è²¢ç®ããéã®åºæ¬ãããã£ããšããã§ã ãã«ãªã¯ãšã¹ãã«é¢ããã¡ãã£ãšãããã³ãããã¯ããã¯ã玹ä»ããŸãããããããã䜿ãã°ããã«ãªã¯ãšã¹ããããã«æŽ»çšã§ããã§ãããã
å®éã®ãšãããå€ãã®ãããžã§ã¯ãã¯ããã«ãªã¯ãšã¹ããå®ç§ãªããã矀ã§ãã (ã€ãŸãããã¡ããšé åºã©ããã«é©çšããªããã°ãããªã) ãšã¯èããŠããŸããã ããã¯ãã¡ãŒãªã³ã°ãªã¹ãããŒã¹ã§éå¶ãããããžã§ã¯ãã§äžè¬çãªèããããšã¯ç°ãªããŸãã GitHub ã®ãããžã§ã¯ãã§ã¯ããã«ãªã¯ãšã¹ãã®ãã©ã³ããå€æŽææ¡ã«é¢ããè°è«ã®å ŽãšæãããŠããããšãå€ãã æçµçã«ã§ãããã£ã unified diff ãããŒãžããã®ã ãšèããŠããŸãã
ãã®éããèªèããŠããããšã倧åã§ããäžè¬ã«ãå€æŽãææ¡ããã®ã¯ãã³ãŒããå®ç§ã«ä»äžããåã®æ®µéã§ãã äžæ¹ãã¡ãŒãªã³ã°ãªã¹ãããŒã¹ã®éå¶ã§ã¯ããŸã ã§ãããã£ãŠãããªãããããæçš¿ããããšãªã©ããŸããªãã§ãããã æªå®æã®æ®µéã§å€æŽãææ¡ããããšã§ãã¡ã³ãããšã®è°è«ãæ©ãã«å§ããããšãã§ããŸãã ã³ãã¥ããã£ã®ååã§ãããé©åãªãœãªã¥ãŒã·ã§ã³ã«ãã©ãçããããã«ãªãã§ãããã ãã«ãªã¯ãšã¹ãã§ææ¡ããã³ãŒãã«å¯ŸããŠã¡ã³ãããã³ãã¥ããã£ããå€æŽã®ææ¡ããã£ããšãã«ã ãããããŒãããäœãçŽãå¿ èŠã¯ãããŸããã å·®åã ãããæ°ããªã³ããããšããŠããã·ã¥ããã°ããã®ã§ãã ãã®åŸã®è°è«ã¯ããããŸã§ã®çµç·¯ãèžãŸããäžã§é²ã¿ãŸãã
ãã«ãªã¯ãšã¹ãã®æçµåœ¢ ãããäžåºŠèŠãŠã¿ãŸãããããã«ãªã¯ãšã¹ãã®äœè ã¯ãèªåã®ã³ãããããªããŒã¹ããŠæ°ããªãã«ãªã¯ãšã¹ããäœã£ãããã§ã¯ãããŸããã åã«ãæ°ããã³ããããè¿œå ããŠããããæ¢åã®ãã©ã³ãã«ããã·ã¥ããã ãã§ãã ãã®ãããã§ãä»åŸãã®ãã«ãªã¯ãšã¹ãã®ããŒãžãèŠçŽãããšããã£ããšãã«ããæçµçãªæ±ºå®ã«è³ããŸã§ã®çµç·¯ãç°¡åã«ç¢ºèªã§ããã®ã§ãã ``Merge'' ãã¿ã³ãæŒãããšãã«ãæ¬æ¥äžèŠãªå Žé¢ã§ãæå³çã«ããŒãžã³ããããäœã£ãŠããã®ã¯ã åŸãããã®ãã«ãªã¯ãšã¹ããåç §ããããããã«ããããã§ãã å¿ èŠã«å¿ããŠããããŸã§ã®æµããããã«èª¿ã¹ãããšãã§ããŸãã
ãã«ãªã¯ãšã¹ããäœã£ãåŸã§å ã®ãããžã§ã¯ãã«å€æŽãå ãã£ããªã©ã®çç±ã§ããã«ãªã¯ãšã¹ãããã®ãŸãŸã§ã¯ããŒãžã§ããªããªãããšããããŸãã ãããªå Žåã¯ããã®ãã«ãªã¯ãšã¹ããä¿®æ£ããŠãã¡ã³ãããããŒãžããããããã«ããŠããããããšã§ãããã GitHub ã¯ããã®ãŸãŸã§ããŒãžã§ãããã©ããããã§ãã¯ããŠããã¹ãŠã®ãã«ãªã¯ãšã¹ãã®ããŒãžã®æäžéšã«çµæã衚瀺ããŸãã
ãã®ãŸãŸã§ã¯ããŒãžã§ããªããã«ãªã¯ãšã¹ã ã®ããã«ãªã£ãŠããããèªåã®ãã©ã³ããä¿®æ£ããŠããã®è¡šç€ºãã°ãªãŒã³ã«ãªãããã«ããããšããã§ãã ããããã°ãã¡ã³ããã«äœèšãªæéããããããã«æžã¿ãŸãã
ã°ãªãŒã³ã«ããããã®äž»ãªéžæè¢ã¯ãäºçš®é¡ãããŸãã
ã²ãšã€ã¯ãèªåã®ãã©ã³ããããã«ãªã¯ãšã¹ãã®å¯Ÿè±¡ãã©ã³ã (æ®éã¯ããã©ãŒã¯å
ã®ãªããžããªã® master
) ã®å
端ã«ãªããŒã¹ããããšã
ããã²ãšã€ã¯ããã®å¯Ÿè±¡ãã©ã³ããèªåã®ãã©ã³ãã«ããŒãžããããšã§ãã
GitHub äžã®éçºè ã®å€ãã¯ãåŸè ãéžãã§ããããã§ãããã®çç±ã¯ãå è¿°ãããšããã§ãã éèŠãªã®ã¯ãããã«ããããŸã§ã®æŽå²ãšãæçµçã«ããŒãžãããšããäºå®ã ãšèããŠããã®ã§ãããã ãªããŒã¹ããããšãæŽå²ããã£ãããããšãã以å€ã®å©ç¹ã¯ãããŸããããããŠããªããŒã¹ã¯ããŒãžã«æ¯ã¹ãŠ ãã£ãš é£ããããééããèµ·ããããããã®ã§ãã
察象ãã©ã³ããããŒãžããŠãèªåã®ãã«ãªã¯ãšã¹ãããã®ãŸãŸåã蟌ãã§ããããããã«ããæé ã¯ã次ã®ãšããã§ãã ãŸãããªãªãžãã«ã®ãªããžããªãæ°ãããªã¢ãŒããšããŠè¿œå ããŠãããããã§ããããŸãã ãããŠããã®ãªããžããªã®ã¡ã€ã³ãã©ã³ããèªåã®ãããã¯ãã©ã³ãã«ããŒãžããŸãã äœãåé¡ãããã°ä¿®æ£ãããã®çµæããã«ãªã¯ãšã¹ããšåããã©ã³ãã«ããã·ã¥ããŸãã
å ã»ã©ã® ``tonychacon'' ã®äŸã«æ»ããŸãããããã«ãªã¯ãšã¹ããåºããåŸã«ãªãªãžãã«ã®äœè ããªããžããªã«å€æŽãå ããããã ãã«ãªã¯ãšã¹ãããã®ãŸãŸã§ã¯åã蟌ããªããªã£ãŠããŸããŸããããããªå Žåã®æé ã¯ã以äžã®ãšããã§ãã
$ git remote add upstream https://github.com/schacon/blink (1)
$ git fetch upstream (2)
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (3/3), done.
Unpacking objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
From https://github.com/schacon/blink
* [new branch] master -> upstream/master
$ git merge upstream/master (3)
Auto-merging blink.ino
CONFLICT (content): Merge conflict in blink.ino
Automatic merge failed; fix conflicts and then commit the result.
$ vim blink.ino (4)
$ git add blink.ino
$ git commit
[slow-blink 3c8d735] Merge remote-tracking branch 'upstream/master' \
into slower-blink
$ git push origin slow-blink (5)
Counting objects: 6, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 682 bytes | 0 bytes/s, done.
Total 6 (delta 2), reused 0 (delta 0)
To https://github.com/tonychacon/blink
ef4725c..3c8d735 slower-blink -> slow-blink
-
ãªãªãžãã«ã®ãªããžããªã ``upstream'' ãšããååã®ãªã¢ãŒããšããŠè¿œå ãã
-
ãã®ãªã¢ãŒãã®ãææ°ã®ç¶æ ããã§ãããã
-
ã¡ã€ã³ãã©ã³ãããèªåã®ãããã¯ãã©ã³ãã«ããŒãžãã
-
è¡çªã解決ãã
-
åããããã¯ãã©ã³ãã«ãåã³ããã·ã¥ãã
ããã§ãã«ãªã¯ãšã¹ããèªåçã«æŽæ°ãããŠãããŒãžå¯èœãã©ãããåã³ãã§ãã¯ãããŸãã
Git ã®ãã°ããããšããã®ã²ãšã€ãããããã®äœæ¥ãç¶ç¶çã«è¡ãããšããããšã§ãã é·æã«ããããããžã§ã¯ãã§ãã察象ãã©ã³ãããã®ããŒãžãäœåºŠã§ãç¹°ãè¿ããã®ã§ãååã®ããŒãžä»¥éã«çºçããè¡çªããæ°ãã€ããŠããã°ãæ··ä¹±ãªãäœæ¥ãç¶ããããŸãã
ãã©ã³ãããªããŒã¹ããŠãã£ããããããå Žåã¯ãããããŠãããŸããŸããã ããããæ¢ã«äœææžã¿ã®ãã«ãªã¯ãšã¹ãã«å¯ŸããŠãããã匷å¶çã«ããã·ã¥ããã®ã¯é¿ããã»ããããã§ãããã ããä»ã®äººããããæå ã«ååŸããŠäœãã®äœæ¥ãé²ãããšãch03-git-branching.asc ã§èª¬æãããããªåé¡ãçºçããŸãã ãªããŒã¹ããå Žåã¯ãããã GitHub äžã§æ°ãããã©ã³ãã«ããŠãæ°ãããã«ãªã¯ãšã¹ããäœãããã«ããŸãããã æ°ãããã«ãªã¯ãšã¹ãããå ã®ãã«ãªã¯ãšã¹ããåç §ããŠããããŠå ã®ãã«ãªã¯ãšã¹ãã¯éããŠããŸããŸãã
âŠãšèšãããŠæ°ã«ãªãã®ã¯ããå ã®ãã«ãªã¯ãšã¹ããã©ããã£ãŠåç §ããã°ããã®ïŒããšããããšã§ãããã GitHub äžã§ä»ã®ãã®ãåç §ããã«ã¯ããããªæ¹æ³ããã£ãŠãGitHub äžã§äœããæžããå Žæãªãã»ãŒã©ãã§ãä»ã®ãã®ãåç §ã§ããŸãã
ãŸãã¯ãå¥ã®ãã«ãªã¯ãšã¹ãããã㯠Issue ãçžäºåç
§ããæ¹æ³ãã玹ä»ããŸãã
ãã«ãªã¯ãšã¹ãã Issue ã«ã¯çªå·ãæ¯ãããŠããŠããã®çªå·ã¯ãããžã§ã¯ãå
ã§äžæã«ãªã£ãŠããŸãã
ã€ãŸããããšãã°ãã«ãªã¯ãšã¹ã#3ãšIssue 3ã äž¡æ¹ãšã ååšããããšã¯ããããªãã®ã§ãã
ä»ã®ãã«ãªã¯ãšã¹ãã Issue ãåç
§ãããå Žåã¯ãã³ã¡ã³ãã説ææã®äžã§åã« <num>
ãšæžãã ãã§ããŸããŸããã
ãããã¯ãããå°ã现ããã誰ãä»ã®äººãäœã£ã Issue ããã«ãªã¯ãšã¹ããæå®ããããšãã§ããŸãã
username#<num>
ãšæžãã°ãä»ãããªããžããªã®å¥ã®ãã©ãŒã¯äžã§ã® Issue ããã«ãªã¯ãšã¹ããåç
§ã§ãããã
username/repo#<num>
ãšæžãã°ãå¥ã®ãªããžããªäžã®ãã®ãåç
§ã§ããŸãã
å®äŸãèŠãŠã¿ãŸãããã å ã»ã©èª¬æãããšããããªããŒã¹ãããäžã§æ°ãããã«ãªã¯ãšã¹ããäœã£ããã®ãšããŸããæ°ãããã«ãªã¯ãšã¹ããããå€ããã«ãªã¯ãšã¹ããåç §ããããšããã§ãã ãŸãããã®ãªããžããªã®ãã©ãŒã¯äžã«ãã Issue ãããŸã£ããå¥ã®ãããžã§ã¯ãã«ãã Issue ãåç §ããã€ããã§ãã 説ææã¯ããã«ãªã¯ãšã¹ãå ã§ã®çžäºåç § ã®ããã«ãªããŸãã
ãã®ãã«ãªã¯ãšã¹ããæçš¿ãããšãç»é¢äžã§ã¯ ãã«ãªã¯ãšã¹ãå ã§ã®çžäºåç §ã®ã¬ã³ããªã³ã° ã®ãããªè¡šç€ºã«ãªããŸãã
GitHub ã®å®å šãª URL ãå ¥åãããšããããç»é¢äžã§ã¯ççž®ãããŠãå¿ èŠãªæ å ±ã ããèŠããŠããããšããããã§ãããã
ãããŒãå ã®ãã«ãªã¯ãšã¹ããéãããšããã®ããšãæ°ãããã«ãªã¯ãšã¹ãã®ã»ãã«ã衚瀺ãããããšãããããŸãã GitHub ãããã«ãªã¯ãšã¹ãã®ã¿ã€ã ã©ã€ã³ã«èªåçã«ãã©ãã¯ããã¯ãéã£ãã®ã§ãã ããã§ãå€ããã«ãªã¯ãšã¹ããèŠã«ãããã¹ãŠã®äººã¯ããã®ãªã¯ãšã¹ãã®åŸç¶ãšãªãæ°ãããã«ãªã¯ãšã¹ãã«ãã©ãçããããã«ãªãã®ã§ãã ãªã³ã¯ã¯ããã«ãªã¯ãšã¹ãå ã§ã®çžäºåç §ã®ã¬ã³ããªã³ã° ã®ããã«è¡šç€ºãããŸãã
issue ã®çªå·ã ãã§ãªããSHA-1 ã瀺ããŠç¹å®ã®ã³ããããåç §ããããšãã§ããŸãã SHA-1 ãæå®ããéã«ã¯ 40 æåã¶ããã¹ãŠã瀺ãå¿ èŠããããŸãããã³ã¡ã³ãã®äžã« SHA-1 ãçºèŠãããšãGitHub ã¯ãããåœè©²ã³ããããžãªã³ã¯ããŠãããŸãã ä»ã®ãã©ãŒã¯ããã®ä»ã®ãªããžããªã®ã³ããããåç §ããå Žåã®æ¹æ³ã¯ãissue ã®å Žåãšåãã§ãã
ä»ã® Issue ãžã®ãªã³ã¯ã¯ãGitHub ã®ããã¹ãããã¯ã¹ã§ã§ããããŸããŸãªããšã®ãã¡ã®ãã»ãã®å§ãŸãã«éããŸããã Issue ããã«ãªã¯ãšã¹ãã®èª¬æãããã«å¯Ÿããã³ã¡ã³ããã³ãŒãã«å¯Ÿããã³ã¡ã³ããªã©ãªã©ã§ã¯ããããã ``GitHub Flavored Markdown'' ã䜿ãããšãã§ããŸãã Markdown ã¯ãã¬ãŒã³ããã¹ããšäŒŒãŠããŸããããããªãããªã¬ã³ããªã³ã°ãè¡ããŸãã
ã³ã¡ã³ãã説ææããMarkdown ã䜿ã£ãŠæžããäŸã Markdown ã§ã®èšè¿°äŸãšããã®ã¬ã³ããªã³ã°çµæ ã«ç€ºããŸãã
GitHub Flavored Markdownã¯ãåºæ¬çãªMarkdownã®ææ³ã«ãGitHub æµã®å³ä»ãããããã®ã§ãã ãã«ãªã¯ãšã¹ãã Issue ãäœã£ãããããã«ã³ã¡ã³ãããããããšãã«ã圹ç«ã€ããšã§ãããã
GitHub æµã® Markdown ã§è¿œå ããã䟿å©ãªæ©èœã®äžã§ãæåã«çŽ¹ä»ããæ©èœããã¿ã¹ã¯ãªã¹ãã§ããããã¯ããã«ãªã¯ãšã¹ãã§ç¹ã«äŸ¿å©ã§ãã ã¿ã¹ã¯ãªã¹ããšã¯ããã§ãã¯ããã¯ã¹ä»ãã®ãããããšãªã¹ãã§ãã ããã Issue ããã«ãªã¯ãšã¹ãã§äœ¿ããšãå®äºããããŸã§ã«äœãæžãŸããªããã°ãããªãã®ããè¡šããŸãã
ã¿ã¹ã¯ãªã¹ãã®äœãããã¯ã以äžã®ãšããã§ãã
- [X] Write the code
- [ ] Write all the tests
- [ ] Document the code
ãã«ãªã¯ãšã¹ãã Issue ã®èª¬ææã«ãã®ããã«æžããŠãããšãMarkdown ã§ã®ã³ã¡ã³ãå ã«è¡šç€ºãããã¿ã¹ã¯ãªã¹ã ã®ãããªè¡šç€ºã«ãªããŸãã
ããã¯ããšãã°ããã«ãªã¯ãšã¹ãã«å¯ŸããŠããããã ãã®ããšãæžãŸããã°ããŒãžã®æºåãæŽãããšããããšã瀺ãããã«äœ¿ãããšããããŸãã ãã®æ©èœã®ãã°ããããšããã¯ãåã«ãã§ãã¯ããã¯ã¹ãã¯ãªãã¯ããã ãã§ãã³ã¡ã³ããæŽæ°ã§ãããšããããšã§ãã ã¿ã¹ã¯ãå®äºãããšãã«ããããã Markdown ãçŽæ¥ç·šéããå¿ èŠã¯ãããŸããã
ããã«ãGitHub ã¯ãIssue ããã«ãªã¯ãšã¹ãã®äžã«ããã¿ã¹ã¯ãªã¹ããèŠã€ããŠããã®ã¡ã¿ããŒã¿ãäžèŠ§ããŒãžã«ã衚瀺ããŠãããŸãã ããšãã°ããããã«ãªã¯ãšã¹ãã®äžã§ã¿ã¹ã¯ãäœã£ããšãã«ããã«ãªã¯ãšã¹ãã®äžèŠ§ããŒãžãèŠããšãã¿ã¹ã¯ãã©ã®çšåºŠå®äºããŠããã®ãã確èªã§ããã®ã§ãã ããã¯ããã«ãªã¯ãšã¹ãããµãã¿ã¹ã¯ã«åãåããããä»ã®ã²ãšãã¡ããã®ãã©ã³ãã®é²æãè¿œãããããããéã«ã圹ç«ã¡ãŸãã ãã®æ©èœã®å®äŸã ãã«ãªã¯ãšã¹ãäžèŠ§ã«ããããã¿ã¹ã¯äžèŠ§ã®æŠèŠè¡šç€º ã«ç€ºããŸãã
ãã®æ©èœã¯ã ãããã¯ãã©ã³ããäœã£ãã°ããã®ãšãã«ãã«ãªã¯ãšã¹ããåºããŠããã®åŸã®å®è£ ã®é²æããã«ãªã¯ãšã¹ãäžã§è¿œããããŠãããããªå Žåã«ããšãŠã䟿å©ã§ãã
ã³ã¡ã³ãã«ãã³ãŒãã¹ãããããè¿œå ããããšãã§ããŸãã ããã¯ããããã ããããšããŠãã ããšããå®éã«å®è£ ããåã«è¡šæããããããšãã«äŸ¿å©ã§ãã ãŸããããŸãåããªããµã³ãã«ã³ãŒããããã®ãã«ãªã¯ãšã¹ãã§å®è£ ã§ããããšã説æãããµã³ãã«ã³ãŒããªã©ã瀺ããšãã«ã䜿ãããŸãã
ã³ãŒãã¹ãããããè¿œå ããã«ã¯ãããã¯ã¯ã©ãŒãã§ãå²ããå¿ èŠããããŸãã
```java
for(int i=0 ; i < 5 ; i++)
{
System.out.println("i is : " + i);
}
```
ãã®ãµã³ãã«ã§ã® 'java' ã®ããã«èšèªåãè¿œå ãããšãGitHub ã¯ã¹ããããã®ã·ã³ã¿ãã¯ã¹ãã€ã©ã€ããè¡ããŸãã ãã®ãµã³ãã«ã¯ãæçµçã« ãµã³ãã«ã³ãŒããã¬ã³ããªã³ã°ããçµæ ã®ãããªè¡šç€ºã«ãªããŸãã
é·ãã³ã¡ã³ãã®äžéšã«è¿ä¿¡ãããšãã¯ããã®éšåãåŒçšããããšãã§ããŸããåŒçšããã«ã¯ãåè¡ã®å
é ã« >
ãä»ãå ããŸãã
ããã¯ãšãŠã䟿å©ã§ããã䜿ããããã®ãªã®ã§ãããŒããŒãã·ã§ãŒãã«ãããçšæãããŠããŸãã
ã³ã¡ã³ãã®äžã§è¿ä¿¡ãããéšåãéžæã㊠r
ããŒãæŒããšãéžæããéšåãåŒçšãããæ°ããã³ã¡ã³ãå
¥åæ¬ãçŸããŸãã
åŒçšã¯ããã®ãããªæãã«ãªããŸãã
> Whether 'tis Nobler in the mind to suffer
> The Slings and Arrows of outrageous Fortune,
How big are these slings and in particular, these arrows?
ãã®ã³ã¡ã³ãããç»é¢äžã§ã¯ åŒçšã®ã¬ã³ããªã³ã°ã®äŸ ã®ããã«ã¬ã³ããªã³ã°ãããŸãã
æåŸã«çŽ¹ä»ããã®ãçµµæåã§ããã³ã¡ã³ãã®äžã§ãçµµæåã䜿ããŸãã
å®éã«ãGitHub ã® Issue ããã«ãªã¯ãšã¹ãã®å€ãã§ãçµµæåã䜿ãããŠããŸãã
GitHub ã«ã¯ãçµµæåã®å
¥åæ¯æŽæ©èœãããã®ã§ãã
ã³ã¡ã³ãã®èšå
¥äžã« :
ãå
¥åãããšããªãŒãã³ã³ããªãŒãæ©èœãç«ã¡äžãã£ãŠãçµµæåãæ¢ãã®ãæäŒã£ãŠãããŸãã
çµµæå㯠:<name>:
圢åŒã§è¡šããã³ã¡ã³ãå
ã®ã©ãã§ã䜿ããŸãã
ããšãã°ããã®ããã«æžãããšããŸãããã
I :eyes: that :bug: and I :cold_sweat:.
:trophy: for :microscope: it.
:+1: and :sparkles: on this :ship:, it's :fire::poop:!
:clap::tada::panda_face:
ãããã¬ã³ããªã³ã°ããçµæã¯ãçµµæåã ããã®ã³ã¡ã³ã ã®ããã«ãªããŸãã
ãã¡ããã¡ã䟿å©ãšããã»ã©ã®ãã®ã§ã¯ãããŸãããã 楜ãããç±æãäŒããæ段ãšããŠã¯ä»ã®è¿œéãèš±ããªããã®ã§ãããã
Note
|
æè¿ã¯ãçµµæåã䜿ãããŠã§ããµãŒãã¹ãå€ããªã£ãŠããŸããã èªåã®èšãããããšãããŸãäŒããããçµµæåãèŠã€ããããã®ãããŒãã·ãŒããå ¬éãããŠããŸãã |
å³å¯ã«èšããš GitHub Flavored Markdown ãšã¯é¢ä¿ãããŸããããããã¯ãšãŠã䟿å©ãªæ©èœã§ãã Markdown ã§ã®ã³ã¡ã³ãã«ç»åã®ãªã³ã¯ãè¿œå ããã®ã¯ãç»åãæ¢ããã URL ãåã蟌ãã ããšé¢åããããã®ã§ãã ããã GitHub ã§ã¯ãããã¹ããšãªã¢ã«ç»åããã©ãã°ïŒããããããã ãã§ããããåã蟌ããã®ã§ãã
ãã«ãªã¯ãšã¹ãå ã§ã®çžäºåç § ã«æ»ããšãããã¹ããšãªã¢ã®äžã«å°ãã ``Parsed as Markdown'' ãšãã³ããæžãããŠããããšãããããŸãã ãããã¯ãªãã¯ãããšãGitHub äžã§ã® Markdown ã§ã§ãããã¹ãŠã®ããšããŸãšãããããŒãã·ãŒããèŠãããšãã§ããŸãã