ããã¯ãUbuntu OnlineãFedora OnlineãWindows ãªã³ã©ã€ã³ ãšãã¥ã¬ãŒã¿ãŒããŸã㯠MAC OS ãªã³ã©ã€ã³ ãšãã¥ã¬ãŒã¿ãŒãªã©ã®è€æ°ã®ç¡æãªã³ã©ã€ã³ ã¯ãŒã¯ã¹ããŒã·ã§ã³ã® XNUMX ã€ã䜿çšããŠãOnWorks ç¡æãã¹ãã£ã³ã° ãããã€ããŒã§å®è¡ã§ããã³ãã³ãã§ãã
ããã°ã©ã ïŒ
NAME
Wiggle - æåŠãããããããé©çšããã¯ãŒãåäœã®å·®åãå®è¡ããŸã
SYNOPSIS
ããã€ã [é¢æ°] [ãªãã·ã§ã³] file [ãã¡ã€ã«]
DESCRIPTION
ã®äž»ãªæ©èœ ããã€ã ãšåæ§ã®æ¹æ³ã§ãã¡ã€ã«ã«ããããé©çšããããšã§ãã
patchïŒ1ïŒããã°ã©ã ã
ç¹åŸŽçãªéãã¯ã ããã€ã ã€ãŸããããšã
ãããã®ãåãéšåãã¿ãŒã²ãã ãã¡ã€ã«ãšå®å šã«äžèŽããŸããã ããã¯æ¬¡ã®ããã«ããŠéæãããŸãã
ãã¡ã€ã«ãšããããåèªã«åå²ãããã¡ã€ã«å ã®åèªã®æé©ãªé 眮ãèŠã€ããŸãã
ãããã«èšèãå ¥ã£ãŠããŸãã ãã®é 眮ãèŠã€ãã£ãããçžéç¹ (åèªåäœ) ãæ€åºãããŸãã
ãããå ã®å 容ã¯å¯èœãªéããã¡ã€ã«ã«é©çšãããŸãã
ã ããã ããã€ã (å Žåã«ãã£ãŠã¯) ãã§ã«é©çšãããŠããå€æŽãæ€åºãã
ããããç¡èŠããŠãã ããã
ããã€ã ãããå ã®ãã¹ãŠã®å€æŽãäœããã®æ¹æ³ã§ã¿ãŒã²ãã ãã¡ã€ã«ã«é©çšãããããã«ããŸãã ãã
ãã¡ã€ã«ã«ç¹å®ã®å€æŽãå ããããšãã§ããªãå Žåããã¡ã€ã«ã«ã¯ãå€æŽç®æã瀺ã泚éãä»ããããŸãã
å€æŽã¯ããšåæ§ã®æ¹æ³ã§è¡ãå¿ èŠããããŸãã ããŒãž(1) ã䜿çšããããã°ã©ã -A ãªãã·ã§ã³ã å
泚éã«ã¯ 3 ã€ã®ã³ã³ããŒãã³ããå«ãŸããŠããŸã: å ã®ãã¡ã€ã«ã®å€æŽãå¿ èŠãªéšå
ãã¡ã€ã«å ã§æ£ç¢ºã«äžèŽããªãã£ããããã®äžéšãããã³
ãããã®ãã®éšåã眮ãæããããã¹ãã ãããã¯ç·ã§åºåãããŠããŸã
æ£ç¢ºã« 7 ã€ã®åäžã®æå (ã<ããã|ããã=ããã>ãã®ãããã) ãå«ãŸããŠããå¯èœæ§ããããŸãã
ãã®åŸã«èª¬æçãªèšèãç¶ããŸãã ããã§
<<<<<<< ãèŠã€ãããŸãã
å ã®ãã¡ã€ã«ã®äžéš
||||||| æåŸ ããã
眮ãæããããã¹ã
=======
眮ãæããããã¹ã
>>>>>>> 亀æ
ã眮æããããã¹ãããã©ããã®ã眮æããããã¹ããã«çœ®ãæããå¿ èŠãããããšã瀺ããŸã
å ã®ãã¡ã€ã«ã®äžéšã ããã ããã€ã äœãå ŽæãèŠã€ãããªãã£ã
ãã®å€æŽã
ããã€ã ã§ã¯ãªããé¢ä¿ããåèªã®ã¿ã瀺ã競åã¬ããŒããäœæããããšãã§ããŸãã
è¡å šäœã衚瀺ãããããã ãã®å Žåãåºåã¯æ¬¡ã®ããã«ãªããŸãã
<<<---ãªãªãžãã«|||å€ã===æ°ãã--->>>
èãããã䜿çšæ³ã® XNUMX 〠ããã€ã èµ°ãããšã§ã patch ããããé©çšãããªã¹ããåéããŸãã
ãããããã®ãšã©ãŒ ã¡ãã»ãŒãžãç£èŠããŠæåŠããŸãã 次ã«ããã¡ã€ã«ããšã«ã
æåŠãèŠã€ãã£ãã®ã§å®è¡
Wiggle -- å ã®ãã¡ã€ã«ã眮ãæãã originalfile.rej
æåŸã«ãåãã¡ã€ã«ã調ã¹ãŠæªè§£æ±ºã®ç«¶åã解決ãã次ã®ããšã確èªããå¿ èŠããããŸãã
é©çšããããããã¯æå³çã«æ£ããã§ãã
ãããã¯ãå ã®ããã ãã¡ã€ã«ã ãã©ãŠãº ã¢ãŒããšããŠ
Wiggle -B < ããããã¡ã€ã«
ããã«ãããå€æŽãšç«¶åãæ€æ»ããããçšåºŠã¯ä¿®æ£ã§ããããã«ãªããŸãã
ãããŠçµæãä¿åã§ããŸãã
OPTIONS
次ã®ãªãã·ã§ã³ã¯æ¬¡ã®ããã«ç解ãããŸãã ããã€ãã ãããã®ããã€ãã¯ããã«è©³ãã説æãããŠããŸã
詳现ã«ã€ããŠã¯ãMERGEãDIFFãEXTRACTãããã³ BROWSE ã«é¢ãã次ã®ã»ã¯ã·ã§ã³ãåç §ããŠãã ããã
-m, - ããŒãž
ãçµåãæ©èœãéžæããŸãã ããã¯ããã©ã«ãã®æ©èœã§ãã
-d, --å·®å
ãå·®åãæ©èœãéžæããŸãã ããã«ããããã¡ã€ã«éã®å·®ç°ã衚瀺ãããŸãã ããã¯ã§ãã
åŸã«äžãããã - ãã©ãŠãº (äžèšãåç §) ãã®å ŽåãXNUMX ã€ã®ãã¡ã€ã«ã®ããããŸãã¯å·®åã¯æ¬¡ã®ããã«ãªããŸãã
ãªãªãžãã«ãªãã§é²èŠ§ã§ããŸãã
-x, - ãšãã¹
ãæœåºãæ©èœãéžæããŸãã ããã«ãããããããŸãã¯ããŒãž ãã¡ã€ã«ã® XNUMX ã€ã®ãã©ã³ããæœåºãããŸãã
-B, - ãã©ãŠãº
ãåç §ãæ©èœãéžæããŸãã ããã¯ã
ç°ãªããã¬ãŒã³ããŒã·ã§ã³ã çµæãåã«æšæºã«éä¿¡ããã®ã§ã¯ãªãã
åºåã§ã¯ãncurses ããŒã¹ã® GUI ã䜿çšããŠè¡šç€ºãããããããããã®åãã³ã¯ã
ã©ã®ãããªç«¶åãé¢ä¿ããŠããã®ãããŸãäœã解決ããå¿ èŠãããã®ãââã調æ»ããããšãã§ããŸãã
ããããæå®ã®äœçœ®ã«å°å»ã¿ã«åããããé åºã§ã¯ç¡èŠãããŸãã
-w, -èšè
ãã¹ãŠã®æäœãšè¡šç€ºãã¯ãŒãããŒã¹ã§ããããšãèŠæ±ããŸãã ããã¯ããã©ã«ãã§ãã
ãå·®åãæ©èœã
-l, -è¡
ãã¹ãŠã®æäœãšè¡šç€ºãè¡ããŒã¹ã§ããããšãèŠæ±ããŸãã
-b, -ç¡èŠ-空çœ
空çœïŒã¹ããŒã¹ãã¿ããæ¹è¡ïŒã®åŒ·èª¿ã解é€ããããšã§éãã決ãŸãã
å€æŽã
éåžžã空çœã¯ãäžèŽãŸãã¯å€æŽã§ããåèªã®ããã«æ±ãããŸãã
ãããã ãã®ãã©ã°ãæå¹ãªå Žåã空çœã¯éã®åºåãæåãšããŠã®ã¿æ©èœããŸãã
ä»ã®èšèãšããèªäœã¯äžèŽããŸããã ãã®åœ±é¿ã§ã
空çœã®éã¯éèŠãªãã®ãšããŠæ±ãããŸããã
æ£ç¢ºã«ã¯ã空çœã¯ãã®åã®åèªãšçµåãããŸãããŸãã¯ã次ã®å Žåã¯ã
è¡ã®å é ã®ã¹ããŒã¹ãšæ¬¡ã®åèªã ãã ããããã«ã¯é¢äžããŠããªã
ãã®åèªã®æ¯èŒã ããããåèªãåé€ããå Žåãæ·»ä»ããã空çœã¯
ãåé€ãããŸãã ããããåèªãè¿œå ããå Žåãæ·»ä»ã®ç©ºçœã¯æ¬¡ã®ããã«è¿œå ãããŸãã
ããã
空ã®è¡ããŸãã¯ç©ºçœã®ã¿ãå«ãè¡ã¯ XNUMX ã€ã®åèªãšããŠæ±ãããŸãã
ã¹ããŒã¹ã®æ°ã«é¢ä¿ãªããä»ã®ç©ºè¡ãšäžèŽããŸãã
-b ã«ã¯å¹æããããŸãã - ã©ã€ã³ ã¢ãŒãã
-p, - ããã
æåŸã«ååãä»ãããã¡ã€ã«ããã¡ã€ã« (--diff ä»ã) ãŸãã¯ããŒãžã§ã¯ãªãããããšããŠæ±ããŸãã
ïŒ - ãšãã¹ïŒã ã® ããŒãž or ãã©ãŠãº ã¢ãŒãã -p ãã¡ã€ã«ã XNUMX ã€ã ãååšããå¿ èŠããããŸãã
ã¯ãããã§ãããè€æ°ã®ãã¡ã€ã«ãžã®ããããå«ããããšãã§ããŸãã ããããããŒãžãããŸã
åãã¡ã€ã«ã«ã ã§äœ¿çšããå Žå ããŒãž ã¢ãŒãã§ã¯ããã®äœ¿çšæ³ã«ã¯ - 亀æ ãªãã·ã§ã³
ããŒãžãããå€æ°ã®ãã¡ã€ã«ãæšæºåºåã«æžã蟌ãã®ã¯çŸå®çã§ã¯ãªãããã§ãã
è€æ°ãã¡ã€ã«ã®ããããåŠçããå Žåã -p æ°å€åŒæ°ãç¶ããããšãã§ããŸã
ã§æå®ããããã¡ã€ã«ããåé€ãããã¡ã€ã«åã³ã³ããŒãã³ãã®æ°ã瀺ããŸãã
ããããã¡ã€ã«ã æ°å€åŒæ°ãæå®ãããŠããªãå Žåã ããã€ã é©åãªå€ãå°ãåºããŸã
ãã¡ã€ã«ã·ã¹ãã å ã«ã©ã®ãããªãã¡ã€ã«ãååšãããã«åºã¥ãæ°å€ã
-r, - 亀æ
éåžžãããŒãžãããåºåã¯æšæºåºåã«æžã蟌ãŸããŸãã ãš - 亀æ
å ã®ãã¡ã€ã«ã¯ããŒãžåºåã«çœ®ãæããããŸãã ã® ãã©ãŠãº ã¢ãŒããããã¯æ瀺ããŸã
ããã€ã çµäºæã«çµæã®ããŒãžãåžžã«ä¿åããŸãã
-o, --output =
ããã¯ãçµæãæšæºåºåã«æžã蟌ãã ããå ã®ãã¡ã€ã«ã眮ãæãããããã®ã§ã¯ãªãã
åºåãæå®ããããã¡ã€ã«ã«æžã蟌ãããã«èŠæ±ããŸãã ããã ãã§ãæå³ããã
ã - ããŒãž or - ãã©ãŠãº åç §ããåäžã®ããŒãžãäžããããå Žåã
ãã®ãªãã·ã§ã³ã¯ãªãŒããŒã©ã€ãããŸã -r.
-R, - éè¡ãã
ãšäžç·ã«äœ¿çšããå Žå å·®å é¢æ°ã§ã¯ãèšç®ããåã«ãã¡ã€ã«ã亀æããŸãã
éãã ãšäžç·ã«äœ¿çšãããšã ããŒãž or ãã©ãŠãº æ©èœã ããã€ã ãäŒãŠã
å€æŽãé©çšããã®ã§ã¯ãªãå ã«æ»ããŸãã
-i, --ããããç¡èŠããŸã
éåžžãwiggle ã¯ãã§ã«å€æŽãããŠããããã«èŠãããããã®å€æŽãç¡èŠããŸãã
ãªãªãžãã«ã§é©çšãããŸãã ãã®ãã©ã°ã䜿çšãããšããããã®å€æŽã¯ç«¶åãšããŠå ±åãããŸã
ç¡èŠãããã®ã§ã¯ãªãã
-W, --show-wiggles
ãšäžç·ã«äœ¿çšããå Žå - ããŒãžãé©åãªå Žæã«å°å»ã¿ã«ç§»åã§ãã競åã¯æ¬¡ã®ããã«å ±åãããŸãã
ãã®ãã©ã°ãçºçããå Žåã®çµæã瀺ãè¿œå ã®ã¹ã¿ã³ã¶ãšç«¶åããŸãã
䜿ãããŠããªãã£ãã è¿œå ã®ã¹ã¿ã³ã¶ã¯ 7 ãå«ãè¡ã§å°å ¥ãããŸãã
ã¢ã³ããµã³ã(&) æåã¯æ¬¡ã®ããã«ãªããŸãã
<<<<<<< ãèŠã€ãããŸãã
å ã®ãã¡ã€ã«ã®äžéš
||||||| æåŸ ããã
眮ãæããããã¹ã
=======
眮ãæããããã¹ã
ïŒïŒïŒïŒïŒïŒïŒ 解決
Wiggle ãæåããå Žåã®ããã¹ã
>>>>>>> 亀æ
--report-wiggles
ããŒãžããã¹ãŠã®å€æŽã®é©çšã«æåãããšãéåžžã¯æ¬¡ã®ã¡ãã»ãŒãžã衚瀺ãããŠçµäºããŸãã
æåã¹ããŒã¿ã¹ (0)ã競åãçºçããŠå€±æããå Žåã®ã¿å€±æ (1) ãå ±åããŸãã
泚éä»ãã ãš --report-wiggles ããã€ã å€æŽãããã°å€±æãå ±åããŸã
ããã¯æ¬¡ã®ãããªå Žåã«åœ¹ç«ã¡ãŸãã ããã€ã èªåããŒãžã«äœ¿çšãããŸã
ã®ããã« gitã äœããã®æºããèµ·ãã£ãå Žåã git 倱æãšçµæãå ±åããŸã
ãããã蚱容å¯èœã§ããããšã確èªããããã«æ€æ»ããããšãã§ããŸãã
-h, - å©ããŠ
ç°¡åãªãã«ã ã¡ãã»ãŒãžãåºåããŸãã ããããã®é¢æ°ã»ã¬ã¯ã¿ãŒã®åŸã«æå®ããå Žå
(- ããŒãž, --å·®å, - ãšãã¹, - ãã©ãŠãº) ãã®æ©èœã«åºæã®ãã«ãã衚瀺ãããŸãã
-V, - ããŒãžã§ã³
ã®ããŒãžã§ã³çªå·ã衚瀺ããŸã ããã€ã.
-v, -詳现
詳现ã¢ãŒããæå¹ã«ããŸãã çŸæç¹ã§ã¯ããã«éãã¯ãããŸããã
-q, - éããª
éé³ã¢ãŒããæå¹ã«ããŸãã ããã«ãããããŒãžé¢æ°ããã®ã¡ãã»ãŒãžã衚瀺ãããªããªããŸãã
解決ã§ããªã察ç«ã§ãã
WORDS
ããã€ã ã¿ã¹ã¯ãå®è¡ãããšãã«ããã¹ããè¡ãŸãã¯åèªã«åå²ã§ããŸãã ã©ã€ã³ãšããã®ã¯åçŽã«ã
æ¹è¡ã§çµäºããæååã åèªã¯æ倧ã®é£ç¶ããåèªã®ããããã§ã
è±æ°åã®æåå (ã¢ã³ããŒã¹ã³ã¢ãå«ã)ãæ倧ã®é£ç¶ããã¹ããŒã¹æååããŸãã¯
ã¿ãæåããŸãã¯ãã®ä»ã®åäžæåã
MERGE
ããŒãžé¢æ°ã¯ãä»ã® XNUMX ã€ã®ããã¹ãéã®ãã¹ãŠã®å€æŽãæ€åºããããšã«ãããæå®ãããããã¹ããå€æŽããŸãã
ãããŠãããã®å€æŽãæå®ãããããã¹ãã«é©çšããŸãã
é垞㯠ããã€ã ã®å¯èœæ§ãæ倧éã«é«ããããã«ãã©ã®åèªãå€åãããã«çŠç¹ãåœãŠãŸãã
æå®ãããããã¹ãå ã§ãæå®ãããå€æŽã®ã³ã³ããã¹ãã«é©åã«äžèŽãããã®ãèŠã€ããŸãã ãã ããããã¯å¯èœã§ã
代ããã«è¡å šäœã®ã¿ãèæ ®ããŠãã ããã
ããã€ã ã³ãã³ãã©ã€ã³ã«ãªã¹ãããããã¡ã€ã«ããå¿ èŠãª XNUMX ã€ã®ããã¹ããæœåºããŸãã
1ã2ããŸã㯠3 ã€ã®ãã¡ã€ã«ããªã¹ãããããšãã§ãããã®ãã¡ã®ãããã XNUMX ã€ãåäžãã€ãã³ã§è¡šãããšãã§ããŸãã
æšæºå ¥åã
XNUMX ã€ã®ãã¡ã€ã«ãäžããããå Žåã -p ãªãã·ã§ã³ãååšããªãå Žåããã¡ã€ã«ã¯ ããŒãž
ãã¡ã€ã«ãã€ãŸããmerge -AããŸãã¯ãwiggleãã®åºåã ãã®ãããªãã¡ã€ã«ã«ã¯æé»çã« XNUMX ã€ã®ãã¡ã€ã«ãå«ãŸããŠããŸãã
ã¹ããªãŒã ãæœåºããŠæ¯èŒããŸãã
XNUMX ã€ã®ãã¡ã€ã«ãæå®ãããå Žåãæåã®ãã¡ã€ã«ã«ã¯åçŽã«äž»ããã¹ããå«ãŸããXNUMX çªç®ã®ãã¡ã€ã«ã«ã¯
ããã ãã¡ã€ã« (ãdiff -uããŸãã¯ãdiff -cãã®åºåããŸãã¯ããã®ã.rejããã¡ã€ã«) ãšããŠæ±ãããŸãã
patch) ãšä»ã® XNUMX ã€ã®ããã¹ãã¯ããããæœåºãããŠããŸãã
XNUMXã€ã®ãã¡ã€ã«ãäžç·ã«äžããå Žåã -p ãªãã·ã§ã³ãæå®ãããšããã¡ã€ã«ã¯ããã ãã¡ã€ã«ãšããŠæ±ãããŸãã
ããããé©çšãããã¡ã€ã«ã®ååãå«ãŸããŸãã ãã®å Žåãè€æ°ã®ããŒãžæäœ
çºçããå¯èœæ§ããããããããããããã§æå®ããããã¡ã€ã«ãã XNUMX ã€ã®ã¹ããªãŒã ãååŸããä»ã® XNUMX ã€ã®ã¹ããªãŒã ãååŸãããŸãã
ãããèªäœããã ã® - 亀æ ãªãã·ã§ã³ã¯å¿ é ã§ãããçµæã¯æžãæ»ãããŸã
ã¿ãŒã²ãããã¡ã€ã«ã«ã
æåŸã«ãXNUMX ã€ã®ãã¡ã€ã«ããªã¹ããããŠããå Žåããããã®ãã¡ã€ã«ã«ã¯æå®ãããããã¹ããš XNUMX ã€ã®ãã¡ã€ã«ãå«ãŸãããšã¿ãªãããŸãã
ä»ã®ããã¹ããé çªã«ã
éåžžãããŒãžã®çµæã¯æšæºåºåã«æžã蟌ãŸããŸãã ãã -r ãã©ã°ãäžãããã
åºåã¯ãå ã®æå®ããããã¡ã€ã«ã眮ãæãããã¡ã€ã«ã«æžã蟌ãŸããŸãã ãã®å Žåã
å ã®ãã¡ã€ã«ã®ååã¯æ¬¡ã®ããã«å€æŽãããŸãã .ããªã° ãµãã£ãã¯ã¹ (æå³ã®ããããããããããªãªãžãã«ãã®æå³)
åããŠäœ¿çšããå Žå patch ããããé©çšããŠãã䜿çšããŸã ããã€ã æåŠãå°å»ã¿ã«åãããŸã)ã
ããã«ã -o ãªãã·ã§ã³ã«ãã¡ã€ã«åãæå®ãããšãåºåã¯ãã®ãã¡ã€ã«ã«æžã蟌ãŸããŸãã
ãã¡ã€ã«ã ãã®å Žåãããã¯ã¢ããã¯äœæãããŸããã
ãšã©ãŒïŒãã¡ã€ã«ã¢ã¯ã»ã¹ãšã©ãŒãªã©ïŒãçºçããŠããªãå Žå ããã€ã ãã¹ãŠã®å Žåãã¹ããŒã¿ã¹ 0 ã§çµäºããŸãã
å€æŽã¯æ£åžžã«ããŒãžãããçµäºã¹ããŒã¿ã¹ã¯ 1 ã«ãªããããã°çãã¡ãã»ãŒãžã衚瀺ãããŸãã
å€æŽã¯å®å šã«ããŒãžã§ããã代ããã«æ³šéãšããŠæ¿å ¥ãããŸããã ãã ãã
ã©ã¡ã --report-wiggles or --show-wiggles ãªãã·ã§ã³ãäžãããã ããã€ã ãååšããŸã
ãããæåããå Žåã§ããå€æŽãåæ ããå¿ èŠãããå Žåã¯ãã¹ããŒã¿ã¹ 1ã
ããŒãžæ©èœã¯ãè¡ãŸãã¯åèªã«é¢ã㊠XNUMX ã€ã®ç°ãªãã¢ãŒãã§åäœã§ããŸãã
-è¡ ãªãã·ã§ã³ã䜿çšãããšãè¡å šäœãæ¯èŒããã競åãããã°å šäœãšããŠå ±åãããŸãã
眮ãæããå¿ èŠãããè¡ã
-èšè ãªãã·ã§ã³ã§ã¯ãåã ã®åèªãæ¯èŒãããççŸãããã°å ±åãããŸãã
圱é¿ãåããåèªãã«ããŒããŸãã ããã¯ã<<<|||===>>> 競å圢åŒã䜿çšããŸãã
ãããã®ãªãã·ã§ã³ã®ãããã䜿çšããªãå Žåã¯ããã€ããªãã ã¢ãããŒããæ¡çšãããŸãã åã ã®èšèã¯ã
æ¯èŒããã³ããŒãžãããŸããã競åãèŠã€ãã£ãå Žåã¯åšå²ã®è¡å šäœãå ±åãããŸã
察ç«ããŠããããã«ã
ããã€ã ä»ã® XNUMX ã€ã®ããã¹ãéã®ãã¹ãŠã®å€æŽã確å®ã«åæ ãããŸãã
ãªããšãªãããŒãžããçµæã å€æŽã«ã¯ XNUMX ã€ã®ç°ãªãæ¹æ³ããããŸã
åæ ã
1 å€åãå€æããå Žå A ããž B & A ãªãªãžãã«ã®é©åãªå Žæã«ãããŸã
ãã¡ã€ã«ã«çœ®ãæãããããšã Bã ããã«ã¯ã次ã®å¯èœæ§ãå«ãŸããŸãã B 空ããŠããŸããã
ããªãããš A 空ã§ãã
2 åçŽã«è¿œå ããå€æŽãèŠã€ãã£ãå Žå B ããã³ãã®çŽåã®ããã¹ããš
æ¿å ¥ã«ç¶ããŠãé©åãªåœ¢åŒã§å ã®ãã¡ã€ã«ã«é£æ¥ããŠèŠã€ãããŸãã
å Žæããããã B ãããã®é£æ¥ããããã¹ãã®éã«æ¿å ¥ãããŸãã
3 å€æŽãèŠã€ãã£ãå Žåãã©ã®å€æŽãè¡ãããã A ããž B ããã¯ïŒæèã«åºã¥ããŠïŒæ¬¡ã®ããã«èŠããŸã
ãšå調ãã B ãªãªãžãã«ã§ã¯ããã®å€æŽã¯ãã§ã«è¡ãããŠãããšæ³å®ãããŸãã
é©çšãããå€æŽã¯ç¡èŠãããŸãã ãããçºçãããšã次ã®ããšãåæ ããã¡ãã»ãŒãžã衚瀺ãããŸãã
ç¡èŠãããå€æŽã®æ°ã¯æ¬¡ã®ããã«åºåãããŸãã ããã€ãã ãã®æé©åã¯æ¬¡ã®ããã«è¡ãããšãã§ããŸãã
ã§æå¶ããã -i ãã©ã°ã
4 äžèšã®å¯èœæ§ã®ãããã«ãåœãŠã¯ãŸããªãå€æŽãèŠã€ãã£ãå Žåã
åè¿°ã®ããã«ç«¶åãå ±åãããŸãã
éã
diff é¢æ°ã¯äž»ã«ãã¢ã©ã€ã³ã¡ã³ããæ€æ»ã§ããããã«ããããã«æäŸãããŠããŸãã ããã€ã
ããã¹ãéã§èšç®ãããããŒãžã®å®è¡ã«äœ¿çšãããŸãã
diff é¢æ°ã®åºåã¯ãdiff ã®çµ±åãããåºåãšäŒŒãŠããŸãã ãããäžæ¹ã§
diff ã¯äžè¬çãªããã¹ãã®é·ãéšåãåºåããŸããã ããã€ãã® diff ã¢ãŒãã¯ãã¹ãŠãåºåããŸãã
åèªããŒã¹ã®ã¢ã©ã€ã¡ã³ããèšç®ããå Žå (ããã©ã«ã)ã ããã€ã ãããã®åèªã衚瀺ããå¿ èŠããããããããŸãã-
ããŒã¹ã®éãã ããã¯ãunified-diff 圢åŒã®æ¡åŒµæ©èœã䜿çšããŠè¡ãããŸãã è¡ã®å Žå
åçŽããŒã§å§ãŸãããã®åŸãç¹å¥ãªãã«ãããŒã§å²ãŸããã»ã¯ã·ã§ã³ãå«ãŸããå ŽåããããŸãã
æåæ¬åŒ§ã è§æ¬åŒ§ã<<<++ããšã++>>>ãã¯è¿œå ãããããã¹ããå²ã¿ãã<<<--ãã¯è¿œå ããã¹ããå²ã¿ãŸãã
åé€ãããããã¹ãã¯ã-->>>ãã§å²ãŸããŸãã
ããã€ã XNUMX ã€ã®æ¹æ³ã®ããããã§æ¯èŒãã XNUMX ã€ã®ããã¹ããæå®ã§ããŸãã
ãã¡ã€ã«ã XNUMX ã€ã ãæå®ãããå Žåãããã¯ããããšããŠæ±ããããã® XNUMX ã€ã®ãã©ã³ãã¯ããããšããŠæ±ãããŸãã
ããããæ¯èŒããŠã¿ãŸãã ããã«ãããã©ã€ã³ããŒã¹ã®ãããããããããå¹æçã«æŽç·Žã§ããããã«ãªããŸãã
ã¯ãŒãããŒã¹ã®ãããã«ã
XNUMX ã€ã®ãã¡ã€ã«ãæå®ãããå Žåãéåžžããããã¯æ¯èŒãããåçŽãªããã¹ãã§ãããšæ³å®ãããŸãã
XNUMX ã€ã®ãã¡ã€ã«ã --patch ãªãã·ã§ã³ãšãšãã«æå®ãããå ŽåãXNUMX çªç®ã®ãã¡ã€ã«ã¯æ¬¡ã®ããã«ã¿ãªãããŸãã
ãããã§ããå Žåãæåã®ãã©ã³ã (-1 ã®å Žå) ãŸã㯠2 çªç®ã®ãã©ã³ã (-XNUMX ã®å Žå) ãæœåºããã
æåã®ãã¡ã€ã«ã§èŠã€ãã£ãããã¹ããšæ¯èŒããŸãã
ãã®æåŸã®ãªãã·ã§ã³ã«ããã ããã€ã ããã ãã³ã¯ã調æŽããããã®ãæé©ãªãã¢ã«ãŽãªãºã ãé©çšããŸãã
å·®åãèšç®ããåã«ãã¡ã€ã«ã䜿çšããŠãã ããã ãã®ã¢ã«ãŽãªãºã ã¯ã
ãã¡ã€ã«ã䜿çšããŠããããé©çšãããã®æ¹æ³ã§çæãããéããæ¯èŒããããšã§ãã®å€ã確èªã§ããŸãã
æåã«ãããã® XNUMX ã€ã®ãã©ã³ãããã¡ã€ã«ã«æœåºããããšã«ãã£ãŠçããéããšã
次ã«ããã®ãã¡ã€ã«ãšã¡ã€ã³ãã¡ã€ã«ã®å·®ãèšç®ããŸãã
ãšãã¹
ã®æœåºæ©èœ ããã€ã æœåºããããã®å éšæ©èœãå ¬éããã ãã§ã
ããããŸãã¯ããŒãž ãã¡ã€ã«ã® XNUMX ã€ã®ãã©ã³ãã
æ£ç¢ºã« XNUMX ã€ã®ãã¡ã€ã«ãæå®ããå¿ èŠããããããã§ãªãéããããã¯ããŒãž ãã¡ã€ã«ã§ãããšã¿ãªãããŸãã
- ããã ãæå®ãããŠããå Žåããããããããšã¿ãªãããŸãã
ãã©ã³ãã®éžæã¯ã次ã®ãããããæäŸããããšã«ãã£ãŠè¡ãããŸãã -1, -2ãŸã㯠-3 æãããªæå³ãæã€ã
ãã©ãŠãº
ã®ãã©ãŠãºæ©èœã¯ã ããã€ã ããŒãžã®çµæã瀺ããŸãããŸã㯠( -d) ã®å·®å
次ã®ãããªããŒã¹ãããŒã¯ã䜿çšããŠããã²ãŒãã§ããããã¹ãããŒã¹ã® GUI viïŒ1ïŒãŸã㯠ãšããã¯ã¹ãšããŸãã
ãã©ãŠã¶ã䜿çšãããšãXNUMX ã€ãŸã㯠XNUMX ã€ã®ã¹ããªãŒã ãåå¥ã«è¡šç€ºã§ããŸãã
ããŸããŸãªçš®é¡ã®ããã¹ãã匷調衚瀺ããããã«äœ¿çšãããè² - è¿œå ãããããã¹ãã¯ç·ãåé€ãããããã¹ãã¯èµ€
ããã¹ããªã©ããããåäœãããŒãžã®å®å šãªçµæããŸãã¯
ããŒãžãšãããã䞊ã¹ãŠè¡šç€ºããŸãã
ãã©ãŠã¶ã«ã¯ãç¶æ³äŸåã®ãã«ã ããŒãžãå€æ°çšæãããŠããã次ã®æ¹æ³ã§ã¢ã¯ã»ã¹ã§ããŸãã
ã?ããå ¥åäž
GUI ã®å³äžã«ã¯ãã«ãŒãœã«ã®äžã«ããããã¹ãã®ã¿ã€ãã衚瀺ãããŸãã
æåã®è²ã§ç€ºãããŸãã ãªãã·ã§ã³ã¯ãå€æŽãªããããå€æŽæžã¿ãããäžèŽããªããã
ç¡é¢ä¿ããã§ã«é©çšãããŠããã競åããŠããã ãããã®æå³ãå°ãã§ãããã£ãã
å®éšã圹ç«ã€ã¯ãã§ãã
äžã«ã¯éãããéã®ç·šéãèš±å¯ãããŸã ãã©ãŠãº ã¢ãŒãã çŸåšã®ããã¹ãã¯
äžèŠãªãã®ã¯æ¬¡ã®ããã«ç Žæ£ã§ããŸã xã ããã«ããã競åãŸãã¯å€æŽãæªå€æŽã«å€æãããŸãã
Unmatched ãã Changed (å®è³ªçã«ç©ºã®æååã«å€æŽãããŸã)ã åæ§ã«
ããã¹ãã¯å¿ èŠã«å¿ããŠããŒã¯ã§ããŸã cã ããã«ããã競åãŸãã¯ç¡é¢ä¿ã次ã®ããã«å€æãããŸãã
ããã£ãã åãããŒãå床䜿çšãããšãå€æŽãå ã«æ»ããŸãã
æåŸã«å€§æå X çŸåšã®è¡ã®ãã¹ãŠã®å€æŽãå ã«æ»ããŸãã
ããå€§å¹ ãªå€æŽãå ããã«ã¯ã次ã®ããã«äœ¿çšã§ããŸã v ãšãã£ã¿ãŒãå®è¡ããŸãã $ VISUAL or
$ç·šéè ç°å¢ã«èšå®ãããŠããå Žåã
å€æŽãå ããå Žåãwiggle ã¯å€æŽãä¿åãããã©ãããå°ããŸãã
- 亀æ äžããããªãã£ãã
èŠå
æåŠãããããããé©çšããå Žåã¯ãåžžã«æ³šæãå¿ èŠã§ãã ããã€ãã æ patch
ããããæåŠããå Žåãããã«ã¯æ£åœãªçç±ããããŸãã ããã§ã ããã€ã ãèŠã€ããããšãã§ãããããããŸãã
åããã¹ãã®å€æŽãé©çšããä¿¡é Œã§ããå Žæã§ãããçµæãé©åã§ãããšããä¿èšŒã¯ãããŸããã
æå³çã«ã¯æ£ããã çµæã¯åžžã«æ€æ»ããŠã次ã®ãšããã§ããããšã確èªããå¿ èŠããããŸãã
æ£ããã
äŸ
ããã€ã - 亀æ file ãã¡ã€ã«.rej
ãããéåžžã®äœ¿ãæ¹ã§ã ããã€ã ãããŠãããããå€æŽãåãå ¥ããŸã ãã¡ã€ã«.rej ãã patch å¯èœæ§
é©çšãããããããããŒãžããŸã file.
ããã€ã -dp1 file ãã¡ã€ã«.rej
ããã«ããã file ãš ã®æ
å·®å ãã¡ã€ã«.rej ãããŠéãã衚瀺ããŸãã ããã«ãããç¹å®ã®ããããã©ãã«ãããã確èªã§ããŸã
é©çšãããŸãã
ããã€ã - ããŒãž - å©ããŠ
ã®ããŒãžæ©èœã«é¢ãããã«ãã衚瀺ãã ããã€ã.
ããã€ã - ãã©ãŠãº - ããã ã¢ããããŒã.ããã
解æãã ã¢ããããŒã.ããã ãããã®ãã¡ã€ã«ãéžæããããããé©çšããããã¡ã€ã«ã®ãªã¹ãã衚瀺ããŸãã
åç §ããŠåãããã詳现ã«èª¿ã¹ãŸãã
ããã€ã ãšçµ±åããããšãã§ããŸã git ããã©ã«ãã®ããŒãžããŒã«ãš diff ãšããŠäœ¿çšãããããã«ããŸãã
éå ·ã ããã¯ã次ã®è¡ãè¿œå ããããšã§å®çŸã§ããŸãã .gitconfig ãŠãŒã¶ãŒã®å®¶ã§
ãã£ã¬ã¯ããªã«ãããŸãã
[ããŠã£ã°ã«ããããŒãž]
name = "Wiggle æè»ãªããŒãž"
ãã©ã€ã㌠= ãŠã£ã°ã« -o %A %A %O %B
ååž°ç = ãã€ããª
[ããŒãž]
ããŒã« = å°å»ã¿ã«åã
[ããŒãžããŒã«ããŠã£ã°ã«ã]
cmd = wiggle -B -o $MERGED $LOCAL $BASE $REMOTE
[difftoolããŠã£ã°ã«ã]
cmd = wiggle -Bd $LOCAL $REMOTE
ãã㯠git ããŒãžããŒã« & git å·®åããŒã« ã€ãããŸã ããã€ã.
ãããå Žå㯠git ãã€ã䜿ãããã« ããã€ã ããŒãžã®å Žå (å±éºãªå¯èœæ§ããããŸã)ã次ã®ããã«è¿œå ã§ããŸãã
* ããŒãž=å°å»ã¿ã«åãã
é©åãªãšãããž gitå±æ§ ã®ãããªãã¡ã€ã« $HOME/.config/git/attributes.
èŠç©ãã
ã®åå ããã€ã 以äžã®åŒçšããã€ã³ã¹ãã¬ãŒã·ã§ã³ãåããŸããã
ç§ãèŠã€ããåé¡ã¯ãç§ããã°ãã°æ®ããããšæãããšã§ã
(ãã¡ã€ã«1+ããã) -> ãã¡ã€ã«2ã
file1ããªããšãã ããããããŒãžããŒã«ãåãããã®ã¯ã
(ãã¡ã€ã«1|ãã¡ã€ã«2) -> ãã¡ã€ã«3ã
ããããå€æŽããã®ã«åœ¹ç«ã€ã°ã©ãã£ã«ã« ããŒã«ãèŠãããšããããŸãã
ãã¡ã€ã«ã«ã
-- ã¢ã³ããªã¥ãŒã»ã¢ãŒãã³ - 2002
æ¬ ç¹
- ããã€ã --diff ã«å¯ŸããŠçæãããæ¡åŒµ unified-diff åºåãèªã¿åãããšãã§ããŸãã
ââèšèã
- ããã€ã --merge ã«å¯ŸããŠçæãããã¯ãŒãããŒã¹ã®ããŒãžåœ¢åŒãèªã¿åãããšãã§ããŸãã
ââèšèã
- ããã€ã Unicode ãç解ããŠããªãããããã¹ãŠã®é ASCII æåãå€ãæ±ããŸãã
å¥èªç¹ãæ±ãã®ãšåãããã«ããããããå¥ã®åèªãšããŠæ±ããŸãã ã®
ãã©ãŠã¶ã§ã¯é ASCII æåãé©åã«è¡šç€ºãããŸããã
onworks.net ãµãŒãã¹ã䜿çšã㊠Wiggle ãªã³ã©ã€ã³ã䜿çšãã