[B! development][merge] kana321ã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

kana321 id:kana321

developmentã¨mergeã«é–¢ã™ã‚‹kana321ã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (4)

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

${{author_name}}$
{{author_name}}{{created}}
{{ #comment }}{{ comment }}{{ /comment }}
- {{ label }}

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

åˆã‚ã¦ã‚³ãƒ¼ãƒ‰ãƒ¬ãƒ“ãƒ¥ãƒ¼ã•ã‚Œã‚‹äººã®ãŸã‚ã®pull requestã¨commitã®ä½œã‚Šæ–¹ - Qiita
pull requestã®ä½œã‚Šæ–¹ã«ã¤ã„ã¦ ä½œæ¥é€”ä¸ã§ã‚‚pull requestä½œã£ãŸã»ã†ãŒã„ã„ã€‚ ä½œæ¥é€”ä¸ã ã¨åˆ†ã‹ã‚‹ã‚ˆã†ã«wantedlyã ã¨ã€[WIP]ã¨ã‹ã‚¿ã‚¤ãƒˆãƒ«ã®æœ€åˆã«ã¤ã‘ã¦ã‚‹ ã‚¿ã‚¤ãƒˆãƒ«ã«æ›¸ãã“ã¨ ä½œæ¥ã®å†…å®¹ãŒåˆ†ã‹ã‚‹ã‚¿ã‚¤ãƒˆãƒ« descriptionã«æ›¸ãã“ã¨ WHY WHATã‚’å¿…ãšæ›¸ã Viewã«å¤‰æ›´ãŒã‚ã‚‹å ´åˆã¯ã€ã‚¹ã‚¯ãƒªãƒ¼ãƒ³ã‚·ãƒ§ãƒƒãƒˆã‚’è²¼ã‚‹ é–¢é€£ã®issueã‚„pull reqeustã¸ã®ãƒªãƒ³ã‚¯ãŒã‚ã‚Œã°æ›¸ã ã‚³ãƒ¼ãƒ‰ã ã‘ã§åˆ†ã‹ã‚Šã«ãã„ç®‡æ‰€ã®èª¬æ˜Ž(ã§ãã‚‹ã ã‘ã‚³ãƒ¼ãƒ‰ã ã‘ã§åˆ†ã‹ã‚‹ã»ã†ãŒã„ã„ã‘ã©) ã‚¤ãƒ¡ãƒ¼ã‚¸ã¯ã€åˆã‚ã¦pull requestã‚’è¦‹ã‚‹äººãŒmergeã™ã‚‹ä¸Šã§å¿…è¦ãªåˆ¤æ–ãŒã§ãã‚‹æƒ…å ±ãŒã‚ã‚‹ã“ã¨ã€‚ ã©ã®ä½œæ¥ã‚’ã—ã¦ã„ã‚‹ã‹ã€æ®‹ã£ã¦ã„ã‚‹ã‹åˆ†ã‹ã‚‹ã‚ˆã†ã«ã€ãƒžãƒ¼ã‚¯ãƒ€ã‚¦ãƒ³ã§ãƒã‚§ãƒƒã‚¯ãƒªã‚¹ãƒˆä½œã‚‹ git commitã®æ–¹æ³•ã«ã¤ã„ã¦ åƒ•è‡ªèº«ã¾ã ã¾ã commitã®å˜ä½ã¯æ±šã„ã®ã§ã€ä»Šã®åƒ•ãƒ¬ãƒ™ãƒ«ã§æ°—ã‚’ã¤ã‘ã¦ã„ã‚‹ã“ã¨ã‚’æ›¸
kana321 2014/09/05
Git - åˆã‚ã¦ã‚³ãƒ¼ãƒ‰ãƒ¬ãƒ“ãƒ¥ãƒ¼ã•ã‚Œã‚‹äººã®ãŸã‚ã®pull requestã¨commitã®ä½œã‚Šæ–¹

Git

commit

ã‚³ãƒ¼ãƒ‰ãƒ¬ãƒ“ãƒ¥ãƒ¼

github

merge

programming

development

ãƒ—ãƒã‚°ãƒ©ãƒŸãƒ³ã‚°

review

issue
ãƒªãƒ³ã‚¯
develop ãƒ–ãƒ©ãƒ³ãƒãªã‚“ã¦ã‚ªãƒ¯ã‚³ãƒ³
Yosuke Furukawa @yosuke_furukawa @sonots masterã¯çµ¶å¯¾ã«å®‰å®šã—ã¦å‹•ä½œã•ã›ãŸã„ã¨ã‹ãã†ã„ã†æ€æƒ³ã ã‚ˆãã€‚developãƒ–ãƒ©ãƒ³ãƒã€ develop ã§å®‰å®šã—ã¦ããŸã‚‰masterã«mergeã™ã‚‹ã£ã¦æ€æƒ³ã ã‘ã©ã€åƒ•ã‚‚æœ€è¿‘ä½œã£ã¦ãªã„â€¦ 2014-05-30 11:16:02 ãã®ã£ã¤ (Naotoshi Seo) @sonots @yosuke_furukawa master ãƒ–ãƒ©ãƒ³ãƒãŒçµ¶å¯¾å®‰å®šã—ã¦ã‚‹ãªã‚‰ã€ä»Šåº¦ã¯ release ãƒ–ãƒ©ãƒ³ãƒã„ã‚‰ãªã„æ„Ÿã‚ã‚‹ã€‚ã§ã€ã©ã¡ã‚‰ã‹ã¨ã„ã†ã¨ release ãƒ–ãƒ©ãƒ³ãƒã‚’å®‰å®šã•ã›ã¦ master ãƒ–ãƒ©ãƒ³ãƒã§é–‹ç™ºã™ã‚Œã°è‰¯ã„ã€‚ãã®ã»ã†ãŒ github ã¨ã‚‚è¦ªå’Œæ€§é«˜ã„æ„Ÿã‚ã‚‹ã€‚ 2014-05-30 11:38:51
kana321 2014/05/30
DVCS

togetter

git

é–‹ç™º

git-flow

development

ãƒ–ãƒ©ãƒ³ãƒ

merge

comp

twitter
ãƒªãƒ³ã‚¯
ãƒ†ã‚¹ãƒˆãƒ•ã‚¡ãƒ¼ã‚¹ãƒˆãªGitãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã«ã¤ã„ã¦ - kazuhoã®ãƒ¡ãƒ¢ç½®ãå ´
Gitã®ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã«é–¢ã™ã‚‹è©±é¡ŒãŒã€ã¾ãŸç››ã‚Šä¸ŠãŒã£ã¦ã„ã‚‹ã‚ˆã†ãªã®ã§ã€åƒ•ãŒå¥½ã‚“ã§ä½¿ã£ã¦ã„ã‚‹ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã«ã¤ã„ã¦æ›¸ãã¾ã™ã€‚ å¯¾è±¡ã¨ã—ã¦ã„ã‚‹ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯ã€GitHubã‚„GitHub Enterpriseç‰ã‚’ä½¿ã£ã¦é–‹ç™ºã•ã‚Œã¦ã„ã‚‹ã€ãƒªãƒªãƒ¼ã‚¹ãƒ–ãƒ©ãƒ³ãƒã‚’åˆ‡ã‚‰ãšã«masterã«ãƒªãƒªãƒ¼ã‚¹ã‚¿ã‚°ã‚’æ‰“ã£ã¦ã„ãã ã‘ã§ååˆ†ãªç¨‹åº¦ã®ã€ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒ“ã‚¹ï¼ˆã®éƒ¨å“ï¼‰ã‚„ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ã™ã€‚ ã¾ãšã€ä»¥ä¸‹ã®ï¼’ç‚¹ã‚’åŽŸå‰‡ã¨ã—ã¦è€ƒãˆã¦ã„ã¾ã™ã€‚ origin masterã‚’å£Šã•ãªã„ origin masterã®ï¼ˆ1st parentã‚’ãŸã©ã‚‹ãƒ„ãƒªãƒ¼ï¼‰ã«ãƒ†ã‚¹ãƒˆã‚’é€šã‚‰ãªã„commitã‚’å…¥ã‚Œãªã„ã‚ˆã†åŠªã‚ã¾ã™ å¤‰æ›´ã®ä¸»é¡Œã‚’å¸¸ã«æ˜Žç¢ºã«ã™ã‚‹ å‰è€…ã®ç†ç”±ã¯ã€masterã‚’ã„ã¤ã§ã‚‚ãƒªãƒªãƒ¼ã‚¹å¯èƒ½ãªå“è³ªã«ä¿ã¤ãŸã‚ã¨(â†12:44è¿½è¨˜)git bisectã™ã‚‹ã¨ãã«å›°ã‚‰ãªã„ã‚ˆã†ã«ã™ã‚‹ãŸã‚ã€‚ãã—ã¦ã€ã“ã‚Œã‚‰ã®åŽŸå‰‡ã‹ã‚‰ã€ä»¥ä¸‹ã®ã‚ˆã†ãªãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã§ä½œæ¥ã™ã‚‹ã“
kana321 2014/02/04
git

commit

github

merge

git-flow

workflow

TDD

github-flow

development

ãƒ†ã‚¹ãƒˆ
ãƒªãƒ³ã‚¯
Inouetakuya
kana321 2013/06/03
*ã‚ã¨ã§èªã‚€

rebase

Tips

*thresh25

git

merge

ãƒ—ãƒã‚°ãƒ©ãƒŸãƒ³ã‚°

development

dvcs

é–‹ç™º
ãƒªãƒ³ã‚¯
1