å¤æ´ããã¼ã¸ãã ================= 並è¡éçº --------- 誰ããããã¸ã§ã¯ãã®ç¬èªãã©ã³ããæã£ããã 並è¡ãã¦å¤æ´ãè¡ãã\ ãªãªã¸ãã«ã®ãã©ã³ããç¶ããéçºã«ã³ãããã§ãã¾ãã ã¾ããªãã§ãããéçºã®ç¬ç«ããã©ã¤ã³ãçµåãããã¨ãå¿ è¦ã«ããã¾ãã ãã®ããã»ã¹ã¯ *ãã¼ã¸ (merging)* ã¨ãã¦ç¥ããã¾ãã mergeã³ãã³ã ------------- å¥ã®ãã©ã³ãããå¤æ´ãåãå ¥ããããã«ã¯ã ``merge`` ã³ãã³ãã使ãã¾ãã æ§æã¯æ¬¡ã®ã¨ããã§ã:: bzr merge [URL] URLã渡ãããªãå ´åããªãªã¸ãã«ã®ãã®ããç±æ¥ããåæã®ãã©ã³ããããã©ã«ã\ ã¨ãã¦ä½¿ããã¾ãã ãã¨ãã°ãBillãMaryã®ä½æ¥å 容ãããã©ã³ããä½ãå ´åã ä¸è¨ã®ããã«ã³ãã³ããå ¥åããã°å½¼å¥³ã®æ¬¡ã®å¤æ´ããã¼ã¸ã§ãã¾ã:: bzr merge ä¸æ¹ã§ãMaryã¯Billã®ãã©ã³ãã§è¡ãããä½æ¥å 容ã彼女ã®ãã©ã³ãã«ãã¼ã¸\ ãããããããã¾ããã ãã®å ´åã彼女ã¯æåã«æ示çã«URLã渡ãå¿ è¦ãããã¾ã:: bzr merge sftp://mary@bill-laptop/cool-repo/cool-trunk ãã¼ã¸ãã©ã³ããã¾ã è¨å®ããã¦ããªããã°ãããã«ãã£ã¦ããã©ã«ãã®\ ãã¼ã¸ãã©ã³ããè¨å®ããã¾ãã è¨å®ããå¾ã§ããã©ã«ããå¤æ´ããããã«ã¯ã ``--remember`` ãªãã·ã§ã³\ ã使ãã¾ãã ãã¼ã¸ã®åä½æ¹æ³ã¯ï¼ -------------------- ãã¼ã¸ã®ããã®ããã¤ãã®ã¢ã«ã´ãªãºã ãããã¾ãã Bazaarã®ããã©ã«ãã®ã¢ã«ã´ãªãºã ã¯æ¬¡ã®ããã«åä½ãã *3æ¹åãã¼ã¸ (3-way merging)* ã®ä¸ç¨®ã§ãã Aãç¥å ã§Bã¨Cã®2ã¤ããã©ã³ãã§ããã¨ä»®å®ããã¨ã次ã®ãã¼ãã«ã¯ä½¿ãããã«ã¼ã«ã\ æ示ãã¾ãã === === === ====== ================= A B C çµæ ã³ã¡ã³ã === === === ====== ================= x x x x unchanged x x y y line from C x y x y line from B x y z ? conflict === === === ====== ================= ãã¼ã¸ã®ä¸ã«ã¯äººéã®æå©ãã«ãã£ã¦ã®ã¿å®äºãããã®ããããã¨ã«çæãã¦ãã ããã ãããã解決ããæ¹æ³ã®è©³ç´°ã¯ `è¡çªã解æ¶ãã <resolving_conflicts.html>`_ ãåç §ãã¦ãã ããã ãã¼ã¸ãè¨é²ãã ----------------- è¡çªã解決ããå¾ã§ããã¼ã¸ãã³ãããããå¿ è¦ãããã¾ããä¾ã§ã:: bzr commit -m "Merged Mary's changes" è¡çªãç¡ãã¦ããæ確ãªã³ããããã¾ã å¿ è¦ã§ãã ä»ã®ãã¼ã«ã¨ã¯ç°ãªããããã¯Bazaarã®æ©è½ã¨èãããã¦ãã¾ãã ã¯ãªã¼ã³ãªãã¼ã¸ã¯å¿ ããããããã¼ã¸ã¨ã¯éããªãã®ã§ãåå¥ã®æ確ãªã¹ããã\ ã¨ãã¦ã³ããããããã¨ã§ããã¹ã¦ãããç¶æ ã«ãããã¨ãæ¤è¨¼ããããã®æåã®\ ãã¹ãã¹ã£ã¼ããå®è¡ã§ãã¾ãã åé¡ãè¦ã¤ãã£ããããã¼ã¸ãã³ãããããåã«ããããè¨æ£ãã\ ããã㯠``revert`` ã使ç¨ãã¦ãã¼ã¸ãå»æ£ãã¹ãã§ãã ãã¼ã¸ã®è¿½è·¡ ------------ Bazaarã®æ©è½ã®ä¸ã§æãéè¦ãªæ©è½ã®1ã¤ã¯ãåæ£åã§é«å質ã®\ *ãã¼ã¸ãã©ããã³ã°* ã§ãã è¨ãæããã¨ãBazaarã¯ä½ããã§ã«ãã¼ã¸ããã¦ãããã¨ãè¦ãã¦ããã\ ãã¼ã¸ã®ããã®æè¯ã®ç¥å ãè³¢ãé¸ã¶ããã«ãã®æ å ±ã使ãã\ è¡çªã®åæ°ã¨è¦æ¨¡ãæå°ã«ãã¾ãã ããªããä»ã®å¤ãã®VCSãã¼ã«ã®é£æ°ã§ãããªãã *ä½ãä½ã§ããã¼ã¸ã¯é¿ãããã¦ãã ãã* ã¨ããç¿æ £ããæãåºãã®ã¯\ æ¬å½ã«é£ããããããã¾ããã Bazaarã«ãã£ã¦ãã¤ã§ãå®å ¨ã«ä»ã®äººã¨ã®ãã¼ã¸ãè¡ããã¨ãã§ãã¾ãã peer-to-peerã®æ¹æ³ã§ãã¾ãããã¨ãã«ãé«ãå質ãä¿ã¤ããã«ã "çµ±åã®ãã¾ãå ´"ã¨ãã¦éä¸åã®ãã©ã³ãã使ããã¨ãé¿ãããã¾ãã ã³ã©ãã¬ã¼ã·ã§ã³ãã¦ããå¤æ´ãæ¬å½ã«åºãå ±æããæºåãã§ãããã\ å¤æ´ãä¸å¿ã®ãã©ã³ãã«ãã¼ã¸ãã¦ã³ãããããæ©ä¼ã§ãã ãã®ããã«ãã¼ã¸æ©è½ããã¾ãããã°éçºè ã®å ±åä½æ¥ã®æ¹æ³ãå¤ãããã¨ãã§ãã¾ãã