è¡çªã®è§£æ¶ =========== ã¯ã¼ã¯ããã¼ ------------- ãã¼ã¸ããã»ã¹ã®éã«ããããã®è¡çªã解æ¶ãããã¨ãå¼·å¶ããä»ã®ããã¤ãã®ãã¼ã«\ ã¨ã¯ç°ãªããBazaarã¯ã§ããéããã¼ã¸ãã¦ããè¡çªãå ±åãã¾ãã ããã«ãã£ã¦è¡çªã®è§£æ¶ãããæ±ãããããã¾ãã 解æ¶ãã¹ãæ¹æ³ã決ãããã¨ãæå©ãããããã«ãã¹ããã¼ã¸ããªã¼å ¨ä½ã®å 容ã\ å©ç¨å¯è½ã ããã§ãã ããããã®è§£æ¶ãããã¯ã°ã«ã¼ããããç¶æ ã§ãããã¨ã確èªããããã«ãã¹ãã\ ããã¤ãé¸ãã§å®è¡ãããã¨ãããã§ãããã è¡çªã®ä¸è¦§ã表示ãã --------------------- ``merge`` ã³ãã³ãã§å ±åãããã®ã¨åæ§ã«ã\ çªåºããè¡çªã®ä¸è¦§ã¯ ``conflicts`` ã³ãã³ãã使ç¨ãããã¨ã§ãã¤ã§ã表示ããã¾ãã ãã㯠``status`` ã³ãã³ãããåºåã®ä¸é¨ã¨ãã¦å«ãããã¨ãå¯è½ã§ãã è¡çªã解æ¶ãã -------------- è¡çªã«ééãããã ``merge`` ã³ãã³ãã¯è§£æ±ºããã¦ããªãé åã表示ãã\ åãè¾¼ã¿ãã¼ã«ã¼ãããããã®ãã¡ã¤ã«ã«è¿½å ãã¾ãã 1ã¤ã®è¡çªãæã¤ããããã®ãã¡ã¤ã«ã«å¯¾ãã¦3ã¤ã®ãã¡ã¤ã«ãä½ãã¾ã: * foo.BASE * foo.THIS * foo.OTHER ``foo`` ã¯è¡çªãããã¡ã¤ã«ã®ååã§ãã å¤ãã®å ´åãåé¡ã«ãªã£ã¦ããããããã®ãã¡ã¤ã«ãæä½æ¥ã§ç·¨éãã\ é¢é£é åãä¿®æ£ãè¡çªãã¼ã«ã¼ãé¤å»ãããã¨ã§è¡çªã解æ¶ã§ãã¾ãã è¡çªã®ä¸ã®ãã¹ã¦ã®ãã¡ã¤ã«ãä¿®æ£ãããã¼ã«ã¼ãåé¤ããå¾ã§ã ``resolve`` ã³ãã³ãã使ç¨ãã¦Bazaarã«ãããã解決ãããã®ã¨ãã¦ãã¼ã¯ããããã«é ¼ã¿ã¾ã:: bzr resolve 代ããã«ãããããã®ãã¡ã¤ã«ãä¿®æ£ããå¾ã§ãããã解æ¶ãããã®ã¨ãã¦ãã¼ã¯ã§ãã¾ã:: bzr resolve foo ``resolve`` ã³ãã³ãã¯ä½æ¥ããªã¼ããBASE, THIS, OTHERãã¡ã¤ã«ãã¯ãªã¼ã³ããããã¾ãã remergeã³ãã³ãã使ã --------------------- ããã¤ãã®å ´åãä»»æã®ãã¡ã¤ã«ã«å¯¾ãã¦ç°ãªããã¼ã¸ã¢ã«ã´ãªãºã ã試ããããã¨ãããã¾ãã ãããè¡ãããã«ã¯ããã¡ã¤ã«ã次ã®ããã«æå®ã㦠``remerge`` ã³ãã³ãã使ãã¾ã:: bzr remerge --weave foo ``foo`` ã¯ãã¡ã¤ã«ã§ ``weave`` ãªãã·ã§ã³ã¯å©ç¨å¯è½ãªãã¼ã¸ã¢ã«ã´ãªãºã ã§ãã ãããã ``criss-cross`` (ååéºä¼)ãã¼ã¸ãæ¤åºãããã¨ãã«ã ãã¨ãã°ã2ã¤ã®ãã©ã³ããåããã®ããã¼ã¸ãã¦ãããäºãããã¼ã¸ããã¨ãã«ã\ ãã®ã¢ã«ã´ãªãºã ã¯ã¨ããã便å©ã§ãã 詳細ã«ã¤ãã¦ã¯ ``criss-cross`` 㨠``remerge`` ã®ãªã³ã©ã¤ã³ãã«ããåç §ãã¦ãã ããã è¡çªã解æ¶ããããã«å¤é¨ãã¼ã«ãå©ç¨ãã ----------------------------------------- è¡çªã解æ¶ããããã«GUIãã¼ã«ãå©ç¨ãããã®ã§ããã°ã *extmerge* ãã©ã°ã¤ã³ãã¤ã³ã¹ãã¼ã«ãã¦ãã ããã次ã®ããã«ã¤ã³ã¹ãã¼ã«ã§ãã¾ã:: bzr extmerge foo ``foo`` ã¯è¡çªãããã¡ã¤ã«ã§ãã 解æ¶ãããã¡ã¤ã«ã®ä¸è¦§ãæä¾ãããããããã¹ã¦ã®è¡çªãã¡ã¤ã«ãæé»ã®å ã«æå®ããããã« ``--all`` ãªãã·ã§ã³ãå©ç¨ã§ãã¾ãã ``extmerge`` ã³ãã³ã㯠``bazaar.conf`` ãã¡ã¤ã«ã®ä¸ã® ``external_merge`` è¨å®ã«ãã£ã¦æå®ããããã¼ã«ã使ãã¾ãã è¨å®ããã¦ããªããã°ã ``kdiff3`` ããã㯠``opendiff`` ã®ãããªäººæ°ã®ãããã¼ã¸ãã¼ã«ãè¨å®ããã¾ãã å¾è ã¯OS Xã®FileMergeã®ã³ãã³ãã©ã¤ã³ã¤ã³ã¿ã¼ãã§ã¤ã¹ã§ãã