Next: , Previous: Creating Branches, Up: Branches   [Contents][Index]


12.7.6.3 »Þ¤ÎÊ»¹ç

¤¢¤ë»Þ¤ÇÊѹ¹¤ò´°Î»¤·¤¿¤È¤­¤Ë¤Ï¡¢¤½¤ì¤é¤ÎÊѹ¹¤ò¥Õ¥¡¥¤¥ë¤Î³«È¯¤Î¼çή¡Ê´´¡Ë¤Ë ¼è¤ê¹þ¤ß¤¿¤¤¤³¤È¤¬¤·¤Ð¤·¤Ð¤¢¤ë¤Ç¤·¤ç¤¦¡£ ¤³¤ì¤Ï´Êñ¤ÊÁàºî¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ ¤È¤¤¤¦¤Î¤Ï¡¢´´¤Ç¤â³«È¯¤Ï¿Ê¹Ô¤·¤Æ¤¤¤ë¤Î¤Ç¡¢ Ê̤θþ¤­¤ËÊѹ¹¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤òÊ»¹ç¤¹¤ëɬÍפ¬¤¢¤ë¤«¤é¤Ç¤¹¡£ VC¤Ç¤Ï¡¢vc-merge¥³¥Þ¥ó¥É¤ÇÊ»¹ç¡Ê¤È¤½¤ì°Ê³°¤Î¤³¤È¤â¡Ë¤Ç¤­¤Þ¤¹¡£

C-x v m (vc-merge)

ºî¶È¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤òÊ»¹ç¤¹¤ë¡£

C-x v m¡Êvc-merge¡Ë¤Ï¡¢ °ìÏ¢¤ÎÊѹ¹¤òºî¶È¥Õ¥¡¥¤¥ë¤Î¸½ºß¤ÎÈǤËÊ»¹ç¤·¤Þ¤¹¡£ ¤³¤Î¥³¥Þ¥ó¥É¤Ï¤Þ¤º¡¢¥ß¥Ë¥Ð¥Ã¥Õ¥¡¤Ç»ÞÈֹ椫2¤Ä¤ÎÈÇÈÖ¹æ¤òÆÉ¤ß¼è¤ê¤Þ¤¹¡£ ¤½¤·¤Æ¡¢¤½¤Î»Þ¤Ç¤ÎÊѹ¹¡¢¤¢¤ë¤¤¤Ï¡¢»ØÄꤷ¤¿2¤Ä¤ÎÈǤΤ¢¤¤¤À¤ÎÊѹ¹¤òÄ´¤Ù¡¢ ¤½¤ì¤é¤ò¥Õ¥¡¥¤¥ë¤Î¸½ºß¤ÎÈǤËÊ»¹ç¤·¤Þ¤¹¡£

Îã¤È¤·¤Æ¡¢»Þ1.3.1¤Ç¤¢¤ëµ¡Ç½¤ò¼ÂÁõ¤·½ª¤¨¤¿¤È¤·¤Þ¤·¤ç¤¦¡£ ¤³¤Î´Ö¡¢´´¤Ç¤â³«È¯¤¬¿Ê¤ó¤Ç¤¤¤ÆÈÇ1.5¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ »Þ¤Ç¤ÎÊѹ¹¤ò´´¤ËÊ»¹ç¤¹¤ë¤Ë¤Ï¡¢ ¤Þ¤º¡¢C-u C-x C-q RET¤ÈÂǤäơ¢´´¤ÎÀèÆ¬ÈǤعԤ­¤Þ¤¹¡£ ÈÇ1.5¤¬¸½ºß¤ÎÈǤˤʤê¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤Î¥í¥Ã¥¯¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢C-x C-q¤ÈÂǤäơ¢ ÈÇ1.5¤ò¥í¥Ã¥¯¤·¤ÆÊѹ¹¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£ ³¤¤¤ÆC-x v m 1.3.1 RET¤ÈÂǤÁ¤Þ¤¹¡£ ¤¹¤ë¤È¡¢»Þ1.3.1¤Ç¤Î¡Ê»Þ¤Î³«»ÏÅÀ¤Ç¤¢¤ëÈÇ1.3¤«¤é»Þ¤ÎÃæ¤Ë¤¢¤ëºÇ¿·ÈÇ¤Þ¤Ç¤Î¡Ë °ìÏ¢¤ÎÊѹ¹¤ò¼è¤ê½Ð¤·¤Æ¡¢¤½¤ì¤é¤òºî¶È¥Õ¥¡¥¤¥ë¤Î¸½ºß¤ÎÈǤËÊ»¹ç¤·¤Þ¤¹¡£ ¤³¤³¤Ç¡¢Êѹ¹¤µ¤ì¤¿ºî¶È¥Õ¥¡¥¤¥ë¤ò¥Á¥§¥Ã¥¯¥¤¥ó¤Ç¤­¤Þ¤¹¡£ ¤Ä¤Þ¤ê¡¢»Þ¤Ç¤ÎÊѹ¹¤ò¼è¤ê¹þ¤ó¤ÀÈÇ1.6¤òºî¤ì¤ë¤Î¤Ç¤¹¡£

¥Á¥§¥Ã¥¯¥¤¥ó¤¹¤ë¤Þ¤¨¤Ë¡¢»Þ¤«¤éÊ»¹ç¤·¤¿¤¢¤È¤Ë¤µ¤é¤ËÊÔ½¸¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£ ¤·¤«¤·¡¢Ê»¹ç¤·¤¿ÈǤò¥Á¥§¥Ã¥¯¥¤¥ó¤·¤¿¤¢¤È¤Ç¡¢ ¥í¥Ã¥¯¤·¤Æ¤µ¤é¤ËÊÔ½¸¤¹¤ë¤Î¤¬¡¢ÉáÄ̤ϸ­¤¤¤ä¤êÊý¤Ç¤¹¡£ ¤³¤¦¤¹¤ì¤Ð¡¢Êѹ¹ÍúÎò¤ò¤è¤ê¤è¤¯µ­Ï¿¤Ë»Ä¤»¤Þ¤¹¡£

¤¹¤Ç¤Ë½¤Àµ¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤òÊ»¹ç¤¹¤ë¤È¤­¤Ë¤Ï¡¢ Êѹ¹¤¬½ÅÊ£¤¹¤ë¾ì¹ç¤¬¤¢¤ê¤Þ¤¹¡£ ¤³¤Î¾õ¶·¤òÌ·½â¤È¸Æ¤Ó¤Þ¤¹¡£ Ì·½â¤·¤¿Êѹ¹¤ÎÄÔêí¤ò¹ç¤ï¤»¤ë¤³¤È¤òÌ·½â¤Î²ò¾Ã¤È¸Æ¤Ó¤Þ¤¹¡£

Ê»¹çÃæ¤ËÌ·½â¤¬µ¯¤³¤ë¤È¡¢VC¤Ï¤³¤ì¤é¤ò¸¡½Ð¤·¡¢ ¤½¤ì¤é¤ò¥¨¥³¡¼Îΰè¤Ëɽ¼¨¤·¤Æ¥æ¡¼¥¶¡¼¤ËÅÁ¤¨¡¢ Ê»¹ç¤òÊ亴¤·¤Æ¤Û¤·¤¤¤«¤É¤¦¤«Ê¹¤¤¤Æ¤­¤Þ¤¹¡£ yes¤ÇÅú¤¨¤ë¤È¡¢ediff¥»¥Ã¥·¥ç¥ó¤ò³«»Ï¤·¤Þ¤¹ ¡Êsee Ediff in The Ediff Manual¡Ë¡£

no¤ÇÅú¤¨¤ë¤È¡¢Ì·½â¤¹¤ëÊѹ¹¤Ï¤É¤Á¤é¤âÌ·½â°õ¤Ç°Ï¤Ã¤Æ¥Õ¥¡¥¤¥ë¤ËÁÞÆþ¤·¤Þ¤¹¡£ Ì·½â¤¹¤ëÉôʬ¤Ï¡¢²¼¤ÎÎã¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£ ºî¶È¥Õ¥¡¥¤¥ë¤Î̾Á°¤Ï‘name’¤Ç¤¢¤ê¡¢ ¥æ¡¼¥¶¡¼B¤ÎÊѹ¹¤ò¼ý¤á¤¿¥Þ¥¹¥¿¥Õ¥¡¥¤¥ë¤ÎÈǤÏ1.11¤Ç¤¹¡£

<<<<<<< name
  User A's version
=======
  User B's version
>>>>>>> 1.11

¤³¤ÎÌ·½â¤ò²ò¾Ã¤¹¤ë¤è¤¦¤Ë¥Õ¥¡¥¤¥ë¤ò¼ê¤ÇÊÔ½¸¤Ç¤­¤Þ¤¹¡£ ¤¢¤ë¤¤¤Ï¡¢¥Õ¥¡¥¤¥ë¤òˬÌ䤷¤Æ¤«¤éM-x vc-resolve-conflicts¤ÈÂǤÁ¤Þ¤¹¡£ ¤¹¤ë¤È¾å¤Ë½Ò¤Ù¤¿ediff¥»¥Ã¥·¥ç¥ó¤ò³«»Ï¤·¤Þ¤¹¡£