2023å¹´ãµãããã
éã«ãµããããã è²ã ãã£ã¦é å¼µã£ã¦çµãã¦ãããã ãã©èªåã®ãããããªãæ°ããã¦ã ãèªåãç ç²ã«ãªã£ã¦ãããè·³ã³ç®±ã§ããããããã£ã¦ã®ãèªåã®ä¸ã«ã¯å¼·ããã£ã¦ãããã«å¾¹ãã¦ãããã ãã©ããã§çµããã æ¥å¹´ã¯èªåã®ãã¨ã¨èªåã®å¨ãã®ãã¨ãèãããã
æ¥è¨
æ9æããã¿ã¼ãåºãã¦ãä»å£åãã¦ããã¼ã«ãã¼ã«åºãã¦æ°´è²¯ãã¦ã
10æããé·ç·æ¬¡ç·ããã¼ã«å ¥ã£ã¦ãå´ã§å¨ããã¼ã«ã«æãçªã£è¾¼ãã§ç©å ·ãæãå ¥ãã¦æ°´æµ¸ãã§å¤§ç¬ãã
12æããæ¼é£¯é£ã¹ã¦ã
13æããé·ç·æ¬¡ç·ãå度ãã¼ã«ã«å ¥ãããäºäººå ±ç²ãã¦30åãããã§æ¬æ¥ã®ãã¼ã«çµäºãï¼Switchã§ã²ã¼ã ãããã£ã説æ¿åï¼ ããããããã¼ã«ã®æ°´æãã¤ã¤ãã¿ã¼ããçä»ãã¦ãããã¼ã«ãã¼ã«ãå¹²ãã
16æãããã«ä¹¾ãã¤ã¤ããããã¼ã«ãã¼ã«ã®æ°´åãæãåã£ã¦ã空æ°ãæãã¦ãçä»ãã
ããã¦ãããï¼ãããï¼ç¹ã«ããã¼ã«ãã¼ã«ã®ï¼çä»ãã¾ã§ã1æ¥ã§çµããã®ã¯åãã¦ããã 空æ°å ¥ãã¯æåããã«ã¢ã¯ã·ã§ã³ãã³ãã ãã©ããããé»åã«å¤ããã¨è² è·ã¯æ¿æ¸ãããã
次ãç¡çãªããããããããªã
ãã¹ã¯ã©ã å®è·µè ãç¥ãã¹ã97ã®ãã¨ããèªãã§ã
æ ªå¼ä¼ç¤¾ã¢ãã©ã¯ã¿ããã®æ¸ç±ãã¬ã¼ã³ãä¼ç»ã§ãã¹ã¯ã©ã å®è·µè ãç¥ãã¹ã97ã®ãã¨ããããã ãã¾ããã æ ªå¼ä¼ç¤¾ã¢ãã©ã¯ã¿ãããããã¨ããããã¾ãï¼
ã¨ããããã§æ¬ã®ææ³ãªãã§ããããã¤ã¾ã§ãã£ã¦ãèªã¿çµããæ°é ããªãã®ã§ãææ³ã¡ã¢ï¼éä¸ï¼ãå ¬éãã¾ãã https://docs.google.com/document/d/17Eo2Vsp2cJuZktIjRTbPUCAC0OoY4TxcL3UKYx7BHtk/edit?usp=sharing
ä»ã®ã¨ããã®ææ³ã¨ãã¦ã¯ã
- ãã¹ã¯ã©ã å®è·µè ããã¹ã¯ã©ã ãéãã¦æãã¦ãããã97ã®ãã¨ã
- ãã¨ãã»ã¤éãã¨ã¯æ¸ããã¦ãããã©ãç¥èéã
- ãã¹ã¯ã©ã å®è·µè ãã ãã«åããæ¬ãããªã
ä¸åº¦ãæãèªã¿ããããã ãã©ããã¹ã¯ã©ã å®è·µè ã®ä¸çããè¦ã¦ãããã¨ããé«ææãæ®ããè ¹è½ã¡æãç¡ãã çè·é¢ãèµ°ãæããæã®ãã´ã¼ã«ã¯è¦ãã¦ãããã©ãå¨ãã®æ¯è²ãè¦ããªããªã£ã¦ã¦ãæ°ã¥ãããã´ã¼ã«ãã¦ããã®ãããªæè¦ã§ãèªã¿çµããæã«ã¯ãããã¼ããããããèªå½ããåºã¦ããªãã£ãã
ãªã®ã§ãä»ã¯ä»ã®èªåãæ°ã«ãã¦ãããã¨ãä¸å¿ã«èªãã§ããæä¸ã
èªåã¯ã¹ã¯ã©ã å®è·µè ã®ã¬ãã«ã¨ã¹ã¯ã©ã ãå®è·µãã¦ããç¾å ´ããã¯é ãé¢ãã¦ããã®ã§ããã£ããèªããã¨ããã¨åºã¦ããåèªãèæ¯ã調ã¹ãªãããããªãã¨ç解ã追ãä»ããããµã¯ãµã¯ã¨ã¯èªã¿é²ãããªãã ãããããã®ãã¼ã¹ï¼1,2話/æ¥ï¼ã ã¨ãã¾ã æ°ãæã¯ãããããã
ãã ãèªåãæ ªå¼ä¼ç¤¾ã¢ãã©ã¯ã¿ããã®æ¸ç±ãã¬ã¼ã³ãä¼ç»ã®å¿åæã«ãã¤ã¼ãããå 容ã¯æ£ããã£ãã
èªåã¯ã¹ã¯ã©ã å®è·µè ãããªããã ãã©ãç®æ¬¡ãè¦ã¦ã¿ããã¹ã¯ã©ã å®è·µè ã§ãªãã¦ãç¥ã£ã¦ããã¨è¯ããã¨ãæ¸ããã¦ãã¿ãããªã®ã§ãå¿åãã¦ã¿ã¾ããï¼ https://t.co/TByEPHHD3v
— GOT (@got4416) 2021å¹´4æ7æ¥
å°ããã¤èªã¿é²ãã¾ãã
ã¹ã¯ã©ã å®è·µè ãç¥ãã¹ã97ã®ãã¨
- çºå£²æ¥: 2021/03/23
- ã¡ãã£ã¢: åè¡æ¬ï¼ã½ããã«ãã¼ï¼
git (diff|merge)tool 㧠WinMerge ã使ãããã®æä½éã®è¨å®
Git 㧠WinMerge ã使ãããã¦èª¿ã¹ã¦ã¿ãããå¿ è¦ãªè¨å®ãããã£ã¦ããã®ã§ãã¾ã¨ãã¦ããã
Git ã®æ¨æºçãªè¨å®ã§ä½¿ããã人åã
以ä¸ã®è¨å®ãè¡ãã°ã以ä¸ã®ã³ãã³ã㧠WinMerge ã使ããããã«ãªã
$ git difftool -t winmerge [<options>] [<commit> [<commit>]] [--] [<path>â¦â] $ git mergetool -t winmerge [-y | --[no-]prompt] [<file>â¦â]
1. WinMergeï¼ã¤ã³ã¹ãã¼ã©çï¼ã使ã£ã¦ã人åã
WinMergeï¼ã¤ã³ã¹ãã¼ã©çï¼ã®ã¤ã³ã¹ãã¼ã«æã«ã以ä¸ã©ã¡ãããè¨å®ããã
a. æ¨æºçãªããã°ã©ã ãã©ã«ãï¼ä»¥ä¸ã®ç°å¢å¤æ°ï¼ã«ã¤ã³ã¹ãã¼ã«ãã
ç°å¢å¤æ° | ãã©ã«ã |
---|---|
ProgramFiles | C:\Program Files |
ProgramFiles(x86) | C:\Program Files (x86) |
ProgramW6432 | C:\Program Files |
b. ï¼»ã·ã¹ãã ç°å¢å¤æ°PATHã¸WinMergeã®ãã©ã«ãã追å ããï¼½ã«ãã§ãã¯ãã¦ã¤ã³ã¹ãã¼ã«ãã
2. WinMergeï¼Zipçï¼ã使ã£ã¦ã人åã
ã¤ã³ã¹ãã¼ã«ï¼å±éï¼å¾ã«ã以ä¸ã©ã¡ãããè¨å®ããã
a. ç°å¢å¤æ° Path ã« \<WinMergeã®ã¤ã³ã¹ãã¼ã«ãã£ã¬ã¯ããª> ãè¨å®ï¼è¿½å ï¼ãã
b. difftool.windiff.path ã« <ãã£ã¬ã¯ããªã®åºåãæåã \ ãã / ã¸ç½®æãã WinMergeU.exe ã¸ã®çµ¶å¯¾ãã¹> ãè¨å®ãã
git config difftool.windiff.path <WinMergeã®ã¤ã³ã¹ãã¼ã«ãã£ã¬ã¯ããªã® \ ã / ã¸ç½®æ>/WinMergeU.exe # C:\WinMerge\ ã«å±éããã®ã§ããã°ä»¥ä¸ã®ã³ãã³ããå®è¡ãã # git config difftool.windiff.path C:/WinMerge/WinMergeU.exe
ï¼Git ã®æ¨æºçãªè¨å®ã§ã¯ãªãï¼WinMergeã®ã³ãã³ãã©ã¤ã³ãªãã·ã§ã³ãæå®ãã¦ä½¿ããã人åã
å¾ã§æ¸ã
git difftool 㧠WinMerge ã使ããããã ãã© path 㨠cmd ã£ã¦ä½ãªã®ãï¼
æä½éå¿ è¦ãªã³ãã³ãã¯ä»¥ä¸ã®ãã¿ã§ã¾ã¨ãä¸ã got4416.hatenablog.com
ãã®ãã¿ã¯ä»¥ä¸ã®è¨å®ãæ·±æããã話ã®äºå®ãï¼çµ¶è³è¿·å®®å ¥ãä¸
difftool.<tool>.path
difftool.<tool>.cmd