Misocaéçºãã¼ã ã®mzpã§ãã æ°ããMisocaã¹ããã«ã¼ãå®æããã®ã§ããããããªå ´æã§é ãã¯ããã¾ããã
ä»æ¥ã¯ãMisocaå ã§ã¬ãã¥ã¼ä¾é ¼ãããåã«ãã£ã¦ããã³ãããã®æ´çã«ã¤ãã¦ç´¹ä»ãããã¨æãã¾ãã Misocaã®éçºã®è©±ã§ãã®ã§ãGitHubã®pull requestãã¼ã¹ã§ã®ã¬ãã¥ã¼ãåæã§ãã
è¦ç´
pull requestãã¬ãã¥ã¼ããããããããã«ãã³ããããæ´çãããã
æ¹é
- æçµçãªçµæã ããæ®ããéä¸ã®è©¦è¡é¯èª¤ã®è·¡ãæ¶ã
- ç¡é¢ä¿ã®å 容ã¯å¥ã®ã³ãããã«ãã
å ·ä½çãªä½æ¦
èªåçæã¨éèªåçæã®ãã®ã¯åãã
scaffoldã§çæããããã®ã Gemfile.lock
çã®èªåã§æ´æ°ããããã®ã¯ãç¹ã«ã¬ãã¥ã¼ããå¿
è¦ã¯ããã¾ããã
ãã®ããããã以å¤ã®æã§æ¸ããå¤æ´ã¨ã¯å¥ã®ã³ãããã¨ã¯å¥ã«ãã¦ããã¨ããã§ãã
試è¡é¯èª¤ã®è·¡ãæ¶ã
PRå ã§çºçãããã°ã®ä¿®æ£ã³ãããããRubocopéåã®ä¿®æ£ã³ãããã¯ãå ã®ã³ãããã¨fixup/squashãã¦æ¶ããã»ããããã§ãã
ã¬ãã¥ã¼ãã¦ã»ããé ã«ã³ãããé ãããããã
ã³ãããé ã«èªãã§ããã°ãå¤æ´å 容ãææ¡ã§ããããã«ãã¾ãããã
ã©ãããé çªãèªã¿æããã¯å¤æ´ããå 容ã«ããã¾ããã主ã«2ã¤ã®æ¹éãããã¾ãã
ä¾åãã¦ããé ã«ã³ããããã¦ãã
ã¢ã¼ããã¯ãã£ã®å å´ããå¤å´ã«åã£ã¦ããããã«ã³ããããæ´çãã¦ããæ¹éã§ãã
åå¨ãã¦ããªãã¡ã½ãããå©ç¨ããã³ãããããªããªãã®ã§ãèªã¿æããªãã¾ãã
ã ãããã®å ´åã以ä¸ã®ãããªé çªã«ãªãã¾ãã
- Gemfile ã®æ´æ°
- è¨å®ãã¡ã¤ã«ã®æ´æ°
- modelã¸ã®å¤æ´
- controller/viewã®å¤æ´
ã¦ã¼ã¶ã®æä½åä½ãã¨ã«ã³ããããã¦ãã
æ©è½ã»ãã¼ã¸åä½ã§ã¦ã¼ã¶ã¼ãå©ç¨ããå¡ã«åãã¦ã³ããããæ´çãã¦ããæ¹éã§ãã
åã¡ã½ãããã©ã®ããã«ä½¿ããã¦ããããã1ã³ãããã§åããããã«ãªãã¾ãããã ãã1ãã¡ã¤ã«ãè¤æ°ã³ãããã§è§¦ã£ã¦ããã¨rebaseãé£ãããªãã®ã§ã注æãå¿ è¦ã§ãã
便å©ãªgitã³ãã³ã
ã³ããããæ´çããéã«ä¾¿å©ãªgitã³ãã³ããç´¹ä»ãã¦ããã¾ãã
ã³ããããæåãããããªãã
ã³ããããç©ã¾ããããã¨ãrebaseããã®ã¯å¤§å¤ã§ãã ãã®å ´åã¯ããã£ããresetãã¦ããåå¥ã§ã³ããããã¦ããã®ã便å©ã§ãã
git reset origin/master git add -p app/models git commit -m '.....'
githubã®commitsã¨ã³ãããé ãæãã
GitHubã®pull requestã®commitsã¯ã³ãããé ã§ã¯ãªãæ¥ä»é ãªã®ã§ããã¾ã«ãããããã¾ãããã®å ´åã¯æ¥ä»ãä¸æ¬ã§ãªã»ããããã¨ãã³ãããé éãã«è¡¨ç¤ºã§ããããã«ãªãã¾ãã
git rebase --ignore-date origin/master