IntelliJãããã³WebStormãªã©ã®ä»ã®ãã¹ãŠã®IntelliJããŒã¹ã®IDEã¯ã3ã€ã®åã«ç«¶åã衚瀺ããgitmergeã®ç«¶å解決ããŒã«ããµããŒãããŠããŸãã
æ·»ä»ãã¡ã€ã«ãã芧ãã ããã
åããŠã£ã³ããŠã§ããŒã«ã«ã®å€æŽãšãµãŒããŒã®å€æŽãæ¯èŒã§ãã解決çµæãããã«ç¢ºèªã§ããããã競åã解決ããã®ã¯éåžžã«ç°¡åã§ãã
ããããµããŒãããŠããããŸããïŒ
ããã¯éåžžã«åªããæ©èœã§ããç§ã¯æ¥åžžæ¥åã«VSCode
ã䜿çšããŠããŸãããã€ã³ã¿ã©ã¯ãã£ãæ§ãšäœ¿ãããããããããŒãžã®ç«¶åã解決ããå¿
èŠãããå Žåã¯WebStorm
ã䜿çšããããšããããããŸãã
ããã«é¢ãããã¥ãŒã¹ã¯ãããŸããïŒ ãã®æ©èœã¯çŽ æŽãããã§ãããã äžæ¹ã§ã¯ãVSã³ãŒãã«å·®åããŒã«ïŒã€ãŸãã2ã€ã®ãã¡ã€ã«ãæ¯èŒããïŒããããŸãããäœãä¿æããããç·šé/éžæããããšã¯ã§ããŸããã äžæ¹ãä¿æãããã®ïŒçŸåšã®å€æŽ/ãã®å€æŽïŒãéžæã§ããããŒãžç«¶åããŒã«ããããŸãã ããŠã@ uyhungã«ãã£ãŠææ¡ãããããŒã«ãªã©ãäž¡æ¹ã®ããŒã«ã1ã€ã®ããŒã«ã«ãŸãšããããšãæåã§ãã
ãŸãã次ã®å¯çš¿è ã®ããã«è¿œå ããããšæããŸããVSCodeã¯çŽ æŽããããœãããŠã§ã¢ã§ãããããç¶æããŠãã ãã:)ïŒ
ããã¯çŽ æŽãããæ©èœã«ãªããŸã...ããã«é¢ãããã¥ãŒã¹ã¯ãããŸããïŒ èª°ãã䌌ããããªããšãããæ¡åŒµæ©èœããå§ãããŸããïŒ
ç§ã¯ãããPyCharmã§äœ¿çšããŠããŸãã ãã®ãããªé©ãã¹ãæ©èœã¯ããã倧ããªããŒãžã®ãã°ãåé¿ããã®ã«å€§ãã«åœ¹ç«ã¡ãŸãã ãã¹ãŠã®ãªã³ã¿ãŒã¯ããã»ã¹äžã«å©çšã§ããããããšã©ãŒ/ã¹ã¿ã€ã«éå/æªäœ¿çšã®å€æ°ãç°¡åã«èŠã€ããããšãã§ããŸãã
ããªãããããå®è£ ããããšãèšç»ããŠãããªãããã®æ©èœãæ¥ãã§ãã ãã:)
ããã¯ãããðã å®å šã«VSCodeã«åãæ¿ããã®ã劚ããŠããã®ã¯ããã ãã§ãã ãšãŠã䟿å©ã§äŸ¿å©ã§ãããã
ãã®æ©èœãå®è£ ããæ¥ãç§ã¯webstormã®äœ¿çšãåæ¢ããŸãã
競åã解決ããã ãã§ãªãããã®ãã¶ã€ã³ã¯å±¥æŽãã¡ã€ã«ã衚瀺ã§ããããã«ããå¿ èŠããããŸãã
git config merge.conflictStyle diff3
ããã¯ä»æ¥ãããŸãããVSCodeã®ãšãã£ã¿ãŒå
ã¬ã€ã¢ãŠãã䜿çšããŸããããã¯ããã€ã¢ãã°ãšæ°ãããŠã£ã³ããŠããããã¢ããããŠãæ¢ã«IMOãéããŠãããã¡ã€ã«ã衚瀺ãããããã¯ããã«åªããŠããŸãã
é£çµ¡ãã£ãïŒ å€åäºå®ãããŠããã®ã§ããããããšãäºå®ãããŠããã®ã§ããïŒ
ã¯ãæ¬åœã«å¿ èŠã§ã
ããã¯éåžžã«å¿ èŠãªæ©èœã§ããã競åã解決ããããã ãã«inteliijã®ã¢ã€ãã¢ã䜿çšããŠããŸãã
+1ãããã¯çŽ æŽãããã§ãããïŒ
ããã«+1ïŒ åãæ¿ããè©Šã¿ãŠããŸãããIMOããã¯WebStormããVSCodeã«åãæ¿ããããã«æ¬ ããŠããäž»èŠãªæ©èœã®1ã€ã§ã
+1ã³ã¡ã³ãã§æ¢ããŠããããŸããïŒ ããã¯äŒè©±ã«äœããããããªãã
ãã®ã¹ã¬ãããèŠãŠåŸ
ã£ãŠãã ãã...
@ Zielak + 1ã³ã¡ã³ãã®è¿œå ããããŸããã
ãããå¯èœã«ãããã©ã°ã€ã³ããããã©ãã誰ãç¥ã£ãŠããŸããïŒ
@rajjejosefssonäžã§è¿°ã¹ãããã«èšå®ã§ããŸãïŒïŒ git config merge.conflictStyle diff3
ïŒ
[merge]
conflictStyle = diff3
ããã/å ±é/ç§ãã¡ãèŠãããã«ã VSCodeã®ãã©ãŒããã/ããŒãã¯å€æŽãããŸããããïŒgitïŒã®ããã©ã«ãã®ããã«ãããã/ usã ãã§ãªãããããã®3ã€ã®éšåãdiffã«ååŸããŸãã
JetBrains IDEãæäŸããäœãä»ã®ãã®ïŒãã§ã«éããŠãããã¡ã€ã«ã®å·®åã衚瀺ããããã«æ»ãããã«è€æ°ã®ãã€ã¢ãã°ãéã以å€ïŒããªãéããç§ã¯ããã«æ¬ ããŠããŸããïŒ
æ°ãããªãªãŒã¹ãããSublimeMergeã«ãåæ§ã®å®è£ ããããŸãã
ããã¯éåžžã«åªããæ©èœã§ããç§ã¯æ¥åžžæ¥åã«
VSCode
ã䜿çšããŠããŸãããã€ã³ã¿ã©ã¯ãã£ãæ§ãšäœ¿ãããããããããŒãžã®ç«¶åã解決ããå¿ èŠãããå Žåã¯WebStorm
ã䜿çšããããšããããããŸãã
ãããã®æ§æã.gitconfigãã¡ã€ã«ã«è¿œå ãã競åãçºçãããã³ã«ã¿ãŒããã«ã§ãgitmergetoolããšå ¥åã§ããŸãã åãã¡ã€ã«ã®webstormããããŒãžGUIã€ã³ã¿ãŒãã§ãŒã¹ã®ã¿ãéããŸãã
[mergetool "webstorm"]
cmd = webstorm merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
trustExitCode = true
[merge]
tool = webstorm
ããã§+1ããããç§ãwebstormã䜿çšããå¯äžã®çç±ã§ãïŒ
+1
+1
確ãã«ããã®UIããŒã«ããªãããšãé€ãã°ãVSCodeã¯ãã°ããããã®ã§ãã
+1ãããã¯ãŸãã«ç§ãããŒãžããŒã«ãã©ã®ããã«èŠããããæåŸ
ããŠãããã®ã§ãã
ãããŠãïŒ5770ã¯ãã®ããã«å®è£
ããå¿
èŠããããŸãã
+1ããã¯ãWebStormãšæ¯èŒããŠVSCã䜿çšããŠãããšãã«æ¬åœã«æ¬ ããŠããå¯äžã®æ©èœã§ãã
ç§ã¯ãããå®è£ ããããšæã£ãŠããŸããVSã³ãŒãã§å®å šãªIDEãšããŠèŠãããå¯äžã®å€§ããªå šäœã§ãã
ããããŸãããWebstormãå¯äžã®å®éã®è§£æ±ºçã®ããã§ãã®ã§ãä»ããããŠã³ããŒãããŸãã
ãã®æ©èœããµããŒãããVSCodeãæ¬åœã«æ¥œãã¿ã«ããŠããŸã!!
ãŸãã誰ããç§ã®ããã«ãã®æçš¿ã«å察祚ãæããããšãã§ããŸããïŒ ããããšãïŒP
ãã®æ©èœã¯äœåã§ããããŸããïŒ
+1ãå®è£ ãããå Žåã¯å®å šã«ããã䜿çšããŸã
ããŒãžã®ç«¶å解決ãå°ãæ¹åããããã«æ°ããèšå®ãšã³ãã³ããè¿œå ããŸãããhttpsïŒ//github.com/microsoft/vscode/pull/74231ãããŒãžãããåŸã®ãšã¯ã¹ããªãšã³ã¹ã¯æ¬¡ã®
æåã«ãæ°ããèšå®merge-conflict.diffViewContext
ãè¿œå ããã競åã«é¢ããã³ã³ããã¹ãã瀺ãããŸããã
以åïŒå·®åã®åšãã«ã³ã³ããã¹ãã¯ãããŸãã
åŸïŒ "merge-conflict.diffViewContext": 3
次ã«ãæ°ããã³ãã³ãCompare Allãå°å ¥ãããçŸåšã®ã¯ãŒã¯ã¹ããŒã¹ãšåä¿¡ããå€æŽã®å®å šãªæ¯èŒã衚瀺ãããŸããããã«ããããã£ã¹ã¯äžã®å€ãã³ã³ãã³ããåä¿¡ããã³ã³ãã³ããããã³ææ°ã®ããŒã«ã«ã³ã³ãã³ããæ¯èŒã§ããŸãã
JetBrainsã¹ã¿ã€ã«ããµããŒãããã«ã¯ããšãã£ã¿ãŒé åã§ããã«äœæ¥ãè¡ãå¿ èŠããããŸããããšãã°ã競åãã3åã®ãšãã£ã¿ãŒã°ã«ãŒããéããŸãã ããããç§ã¯ãŸã äžèšã®çŸåšã®è§£æ±ºçã«ã€ããŠã®ããªãã®ãã£ãŒãããã¯ãèãããã§ãã
ããã¯ã«ãã³ããã æ°ãããã¡ã€ã«ã«ããŒãžããå€æŽã1è¡ãã€éžæã§ããŸããããããšã1ã€ã®ãã¡ã€ã«ã ãã§ããã è¡ããšãŸãã¯ãã¹ãŠãçŽ æŽãããã§ããã!!!
ããããã®ãã¡ã€ã«ããã®åå€æŽããããã¯ããšã«åãå ¥ããŠãããããã»ãšãã©ã®ãŠãŒã¹ã±ãŒã¹ãã«ããŒãã3çªç®ã®ãã¡ã€ã«ã«ããŒãžã§ããå Žåã ãããã£ãŠãããšãã°ãäžæ¹ã®ãã¡ã€ã«ã«3ã€ã®å€æŽããããããäžæ¹ã®ãã¡ã€ã«ã«4ã€ã®å€æŽãããå Žåãå¿ èŠãªãã®ãéžæã§ããŸãã 1ã€ã®ãã¡ã€ã«ãã2ã€ã®å€æŽãåãå ¥ãããã1ã€ã®ãã¡ã€ã«ãã2ã€ã®å€æŽãåãå ¥ããããã«ã ããã¯ã§ããŸããïŒ ãããããªã...ããã¯çŽ æŽãããã§ãïŒ
@rebornixè¿œå ã®ã³ã³ããã¹ãã¯çŽ æŽãããããã¹ãŠãæ¯èŒããã®ã奜ãã§ãããç§ã«ãšã£ãŠã¯ãŸã ããã€ãæ¬ ããŠããããšããããŸãã
ïŒ2ã¯ãããããä»æ¥ãã«ã¹ã¿ã ãã¡ã€ã«ã·ã¹ãã ãããã€ããŒã䜿çšããŠå®è¡ã§ããŸãïŒãã ããããã¯å€ãã®ããéãã®ããã«æããŸãïŒ
@eamodio
åããµã€ãããå ±éããŒã¹ãšæ¯èŒããŸãã3ãŠã§ã€ããŒãžãã¥ãŒãããããæåã§ãããããã¯å°ãªããšãæ«å®çã«ã¯åœ¹ç«ã€å¯èœæ§ããããŸãïŒGitLensã§ããã«äœããè¿œå ããããšãè©Šã¿ãŠããŸããïŒ
ããã«ã¯ãæ°ãã3æ¹ådiffãã¥ãŒïŒ3æ¹ådiffã¢ã«ãŽãªãºã ãš3åãšãã£ã¿ãŒïŒãè¿œå ããå¿
èŠããããŸãããå®è¡å¯èœã§ãã ïŒ2ã®å Žåããã£ã¹ã¯äžã®ãã¡ã€ã«ã³ã³ãã³ãã«ããŒãžã®ç«¶åïŒ >>>>>>, <<<<<<
ïŒãå«ãŸããŠãããããã«ã¹ã¿ã ãã¡ã€ã«ã·ã¹ãã ãããã€ããŒãæ£ããæ¹æ³ã ãšæããŸãããå·®åãã¥ãŒããã³ã³ãã³ãã®å€æŽãéžæããå Žåã¯ãå¿
èŠãããŸããããã£ã¹ã¯äžã®ãã¡ã€ã«ãå°ç¡ãã«ããã®ã§ãããã¯ãã§ã«ä»®æ³ãã¡ã€ã«ã·ã¹ãã ãããã€ããŒã§ãã
ãã®æ©èœãéåžžã«å¿ èŠã§ãã
@rebornixããŒãããœã³ã³ã®ç»é¢ã¯ããã»ã©å€§ãããªãã®ã§ã3åã®ãšãã£ã¿ãŒãéããããããã«è¯ããšæãã¢ã€ãã¢ã奜ãã§ãã æçµçã«GitkrackenããŒãžããŒã«ã®ããã«èŠããããã«å°ãæ¹åããæ¹ãç°¡åã ãšæããŸããäžéšã®ãšãã£ã¿ãŒã«ã³ã³ããã¹ãã衚瀺ãããäžéšã«relutingãã¡ã€ã«ïŒçŸåšã¯>>>> <<<< ...ïŒãç·šéã§ããŸãã ã
ãããããŒãžã®ç«¶åãããå Žåã¯ãVSCodeã§ãããžã§ã¯ãã®ä»ã®äœæ¥ãè¡ã£ãŠããå Žåã§ããPHPStormã«åãæ¿ããããšããããããŸãã 2幎ãçµéããé©åãªå䜵ããŸã è¡ãããŠããªãã®ã¯å¥åŠãªããšã§ãã
@rebornixããŒãããœã³ã³ã®ç»é¢ã¯ããã»ã©å€§ãããªãã®ã§ã3åã®ãšãã£ã¿ãŒãéããããããã«è¯ããšæãã¢ã€ãã¢ã奜ãã§ãã æçµçã«GitkrackenããŒãžããŒã«ã®ããã«èŠããããã«å°ãæ¹åããæ¹ãç°¡åã ãšæããŸããäžéšã®ãšãã£ã¿ãŒã«ã³ã³ããã¹ãã衚瀺ãããäžéšã«relutingãã¡ã€ã«ïŒçŸåšã¯>>>> <<<< ...ïŒãç·šéã§ããŸãã ã
ç§ã¯åæããŸããã3åã®ã¬ã€ã¢ãŠãã¯ãWebstormãéåžžã«åªãããã®ã«ããŠããçç±ã®äžéšã§ãã ããã¯éåžžã«ãã¡ããšããæŠèŠãä¿ã¡ãŸã
ããã§ãåãã§ãããããŒãžã®ç«¶åã解決ããããã«ãåžžã«IntelliJã«åãæ¿ããŸãã ãåçŽãªè¡çªã解決ãããéæ³ã®æããŒã«ã¯ãæéãå€§å¹ ã«ç¯çŽããŸãã
競åã解決ããããã«VisualStudio2017ã«æ»ããŸã...
8ïŒ35 AMã®ç«ã2019幎6æ25æ¥ã«FABB [email protected]æžããŸããïŒ
ããã§ãåãã§ãããããŒãžã®ç«¶åã解決ããããã«ãåžžã«IntelliJã«åãæ¿ããŸãã
ãåçŽãªè¡çªã解決ãããéæ³ã®æããŒã«ã¯ãæéãå€§å¹ ã«ç¯çŽããŸããâ
ãã®ã¹ã¬ããã«ãµãã¹ã¯ã©ã€ãããŠããããããããåãåã£ãŠããŸãã
ãã®ã¡ãŒã«ã«çŽæ¥è¿ä¿¡ããGitHubã§è¡šç€ºããŠãã ãã
https://github.com/microsoft/vscode/issues/37350?email_source=notifications&email_token=AAEN6O3LOPBVEY7PMABVNRDP4I3KZA5CNFSM4EBV5J4KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5
ãŸãã¯ã¹ã¬ããããã¥ãŒãããŸã
https://github.com/notifications/unsubscribe-auth/AAEN6O4AO24V4GB24EWOJGDP4I3KZANCNFSM4EBV5J4A
ã
vscodeã¯git競åããŒã«ãå€æŽããå¿
èŠããããŸããããã¯ã競åã解決ãããšãã«vscodeã<<<
ã ===
è¿œå ããèšèªæ§æãšã©ãŒãçºçããããã§ãã
@ SupinePandora43ããã¯VSCodeã§ã¯ãªããgitã競åãåŠçããæ¹æ³ã§ããã競åããè¡ã«<<<
ã ===
ãè¿œå ããŸãã WebStormã¯ãã®ãããã¯ã解æããããŒãžããããã®åªããããžã¥ã¢ã«ããŒã«ãäœæããŸãã
@vedmant then ... vscodeã«ã¯ããŒãµãŒãå¿ èŠã§ã
ãã¡ããã芧ãã ããã ããã¯ããªããæå³ããããšã§ããïŒ
https://github.com/Microsoft/vscode-tips-and-tricks/blob/master/media/resolve_merge_conflicts.gif
@ minkir014äžéšã®å ã®ã³ã¡ã³ãã«æ·»ä»ãããŠããç»åã確èªããŠãã ãããããã¯ã誰ããæå³ããããšã§ãã
ããã¯vscodeã®ãã³ããšã³ãã§ãããvscodeã«çµã¿èŸŒãŸããŠããããšãæå³ããŸãã ã§ã¯ããªããã®åé¡ã¯ãŸã éãããŠããã®ã§ããããã
@ minkir014å ã®ã³ã¡ã³ãã®ç»åãããäžåºŠããã«ãªã³ã¯ããŸããæããã«å¥ã®ããšãèããŠããããã§ãïŒ https ïŒ
@ minkir014 VSã³ãŒãã®å 容ã¯ãIntelliJã®æ©èœã«è¿ããã®ã§ã¯ãããŸããããããæ¯èŒããŠãã ããïŒ //user-images.githubusercontent.com/1470309/32250860-c677e4ce-bec0-11e7-82b5-0196d981cc28.pngãšæçš¿ããå 容https://github.com/Microsoft/vscode-tips-and-tricks/blob/master/media/resolve_merge_conflicts.gifå€ãã®é¡äŒŒç¹ããããŸããïŒ
@ minkir014çµã¿èŸŒã¿æ©èœã®ããããã®ã¹ã¬ããã§èª¬æããŠãããã®ãšåãã§ã¯ãããŸããã
3æ¹åããŒãžã¯ãVSCodeãå¯äžã®IDEãšããŠäœ¿çšããããšã劚ããå¯äžã®æ©èœã§ãã
3æ¹åããŒãžã¯ãVSCodeãå¯äžã®IDEãšããŠäœ¿çšããããšã劚ããå¯äžã®æ©èœã§ãã
èãããŸãã ããã¯ç§ãã¡ãå¿ èŠãšãããã©ãŒæ©èœã§ãã ãã®çç±ã ãã§PHPStormãç¶æããå¿ èŠããããŸãã
äžèšã®ã¹ã¬ããããã®æŽæ°ã«å¿ èŠãªãã®ã®ã»ãšãã©ãå«ãŸããŠããããšã«æ°ä»ãã®ã«ãã°ããæéãããããŸãããããã¯ãããã«è¡šç€ºãããªãã ãã§ãªããä»»æã®3æ¹åå·®åãå®è¡ããããšãã§ããŸããïŒå°æ¥çã«ã¯GitLensã«ãã£ãŠä»»æã®æ¹æ³ã§è¶ 匷åã«ãªãäºå®ã§ãïŒééããªããå·®åãšç¥å ã®éžæãã³ãããããŸãïŒã
以äžã®æ§æã®å€æŽã¯ã2ã€ã®ç°ãªãå€æŽãè¡ããããšãã®ã³ã³ããã¹ããç解ããåæã«ãããã®éãã調æŽã§ããããã«ããå Žåã«ãããã©ã«ãã®VSCode / Gitèšå®ãããåªããå®éã®ããŒãžç«¶åã³ã³ããã¹ãåã®ããŒãºã®ã»ãšãã©ãã«ããŒããŠããŸãã ãããã£ãŠãå°æ¥ã®æ€çŽ¢è ã®ããã«ïŒ
git config merge.conflictStyle diff3
"merge-conflict.diffViewPosition": "Below"
ããã§ãšãããããŸããããã§ã2ã€ã®å·®åã®ã³ã³ããã¹ããéçåç §ãäž¡æ¹ãåå²ããå ±éããŒã¹ãšããŠè¡šç€ºã§ããŸãããŸããã€ã³ã©ã€ã³å·®åã䜿çšããŠ3ã€ã®ã³ã³ããã¹ãïŒç¥å ããã©ã³ãAããã©ã³ãBïŒãã¹ãŠãç·šéããããšãã§ããŸãã ä»ã§ã¯è²§ä¹äººã®vimdiffã§ãã
ïŒãã€ã©ã€ããªãã§å ±éã®ç¥å ã®å·®åã衚瀺ããããã«éçãã€ã³ãè¿œå ãããšãvimdiffãšèšãã°ãäž»èŠãªãšãã£ã¿ãŒãå·®åã¢ã«ãŽãªãºã ã®æŽæ°ãå¿ èŠãšããã«ãç°¡åã«è¿œå ã§ããŸãïŒ
ãããŠãããããGITã®å€æŽã§ã¯ãªãå Žåã¯ã©ããªããŸããïŒ ïŒç§ã¯PERFORCEã䜿çšããŠããŸãããçŸæç¹ã§ã¯ãã®éžæè¢ããããŸãããïŒ
ïŒ25887ã®è€è£œ
ããã¯2åã®ãã¥ãŒã§ãã ããã¯3åã®ãã¥ãŒã§ãã
ïŒ25887ã®è€è£œ
ããã¯2åã®ãã¥ãŒã§ãã ããã¯3åã®ãã¥ãŒã§ãã
åãåé¡ãªã®ã§ãåé¡ããªã³ã¯ãã䟡å€ããããšæããŸããã
2ã€ãŸãã¯3ã€ã®åããœãªã¥ãŒã·ã§ã³ã®äžéšã§ãã
ã¡ãªã¿ã«ããªã³ã¯ã®åæ©ã¯ãäž¡æ¹ã®åé¡ããé
åãåŒãåºããäžè¶³ããŠããåäœãã§ããã ãæ©ãè¿œå ããããšã§ã-ç§ã¯æ¬åœã«ãã®æ©èœã䜿çšããããšæããŸãâº
ããããããã«310ã«å¯Ÿãã427祚ããããŸãïŒïŒ25887ïŒã ãã§ã«ããŒãžãããå Žåã¯ãããŒãžããŠæ祚ãæ°ããããšãã§ããŸãã ãã®æ©èœã¯ããã10ã«ãªããŸã
å¹æçã§ãŠãŒã¶ãŒãã¬ã³ããªãŒãªIntelliJã¹ã¿ã€ã«ã®3ãã€ã³ããŒãžïŒ3ãŠã§ã€ããŒãžãšåŒã°ããããšããããŸããã2ã€ã®ãã¡ã€ã«ãçµæãã€ã³ã«ããŒãžãããŸãïŒãå®è£ ãããšãVSCodeãšãã£ã¿ãŒè£œåãäžçã®ãããã«ãªããŸãã ç§ã¯ããã確信ããŠããŸã-ãããŠãããã®ã¹ã¬ããã®ããã€ããšå€ãã®ã³ã¡ã³ãã¯ããã®æ©èœã®æ¬ åŠã®ããã«åœŒãã®Intellij補åããä¿æããŠããã人ã ã®ç©èªãèªã£ãŠããŸãã 補åã®ææè /éçºè ã«ãšã£ãŠãæ©èœã®ãªã¯ãšã¹ããã©ã®ããã«åæ©ä»ããããããåªå é äœãæ確ã«ãªã£ããããã®ãããããŸããã ããã«é¢ããããªãã®ïŒéçºè ãvsã³ãŒãã®ãããŒãžã£ãŒïŒèãã«é¢ãããã¥ãŒã¹ã¯ãããŸããïŒ
ãã§ã«å®è£ ãããŠããæ©èœãã©ãã ãè¿ãããã»ã®ããããŠãããšããäºå®ã¯ãVS CodeãæãŸããçµæã«å°ãã ãã§ãããã»ãšãã©ã®äœæ¥ããã§ã«å®äºããŠããå Žåããããå®å šã«å®è£ ããããšã¯ããã»ã©é£ããããšã§ã¯ãªãã¯ãã§ãã
ããããç§ããŸã MeldãmergetoolãšããŠäœ¿çšããŠããçç±ã§ãã
ããããç§ããŸã MeldãmergetoolãšããŠäœ¿çšããŠããçç±ã§ãã
åŽé«ãªããŒãžã¯ã¡ã«ããããã¯ããã«åªããŠããŸã
ããããç§ããŸã MeldãmergetoolãšããŠäœ¿çšããŠããçç±ã§ãã
åŽé«ãªããŒãžã¯ã¡ã«ããããã¯ããã«åªããŠããŸã
ç§ã¯åæããŸããããããã©ã®ããŒãžããŒã«ãæé«ã®ãã®ã§ããããè°è«ããå Žæã§ã¯ãªããšæããŸãã
å°ãªããšããçŸåšã®å€æŽãšä»åŸã®å€æŽã®äž¡æ¹ã«å ±éã®BASEã衚瀺ããããšã¯å¯èœã§ããïŒ
@ackvfã¯ãã 3è éå·®åã§ã§ããŸã
ã ãããäœãæ°ããã®ïŒ
åŸ ã£ãŠããã誰ããå©çšå¯èœã«ãªã£ããšãã«ç§ã«æ°ä»ã
åãããã«åŸ ã£ãŠããŸã...ãã®ããŒã«ã¯çŽ æŽãããã§ããã
å€åç§ãIntelliJãååŸããå¿ èŠããããŸã:)
ããã§+1ããããç§ãwebstormã䜿çšããå¯äžã®çç±ã§ãïŒ
+1
åãããã«åŸ ã£ãŠããŸã...ãã®ããŒã«ã¯çŽ æŽãããã§ããã
å€åç§ãIntelliJãååŸããå¿ èŠããããŸã:)
ãã®ãã±ããã®ãã¹ãŠã®ãµãã¹ã¯ã©ã€ããŒã«é¢é£ã®ãªãã¡ãã»ãŒãžãã¹ãã ããã®ãæ¢ããŠãã ããã
ããããvscodeãã¡ã€ã³ãšãã£ã¿ãŒãšããŠäœ¿çšããªãäž»ãªçç±ã§ãã çµã¿èŸŒã¿ã®gitçµ±åãšããŒãžãWebStormã§éåžžã«åœ¹ç«ã€ã®ã§ããããè¿œå ãããã®ãèŠãã®ã¯çŽ æŽãããããšã§ãã ãããè¿œå ãããã®ãèŠãã®ã¯çŽ æŽãããããšã§ãã
ç§ã¯ç§ã®äººçã§ãããå¿ èŠã§ãã
ãã®æ©èœã«é¢ãããã¥ãŒã¹ã¯ãããŸãããïŒ ãŸãã¯ãã©ã°ã€ã³ã§ã倧äžå€«ã§ãïŒD ??
vscodeã¯çŽ æŽãããã§ãããããã§ããã®ããã ãã«intellijããŒãžããŒã«ã䜿çšããŠããŸã..ïŒ
ç§ãã¡ãæã£ãŠãããã¹ãŠã®ãã¥ãŒã¹ã¯ããå®å šãªããŒãžãµããŒãïŒ3ãŠã§ã€ïŒãã«èšåããŠãã2020ããŒããããã§ãïŒ https ïŒ
ã¡ãã£ãšãããªãïŒ VSCodeããã®ãã®ãããªå€§ããªãã¹ã éçºè ã¯ãã®æ©èœãªãã§ã©ããã£ãŠçãæ®ãã®ã ãããã ç§ã¯ããã®ããã«ãŠã§ãã¹ããŒã ã«é Œãã€ããã§ã
Visual StudioCodeã®GitGraphæ¡åŒµæ©èœã確èªããŸããããããã§ãæ©èœã§ã¯ãããŸããã pycharmã§éžæçã«ããŒãžããŒãžã§ã³ãé€ããã¹ãŠã«vscodeã䜿çšããŠããŸãã
ããŒãžã«IntelliJã䜿çšããŠããŸãã ãŸããã³ãããããã«ã§ã¯ãåããã¡ã€ã«ããä¿æããã³ããããéžæã§ããŸãã ãªã©ð
ç§ããã®ãªã¯ãšã¹ããäœæããã®ã¯3幎åã®ç·ã§ã:)
VSCodeã¯çŽ æŽãããã§ãããGité¢é£ã®ã¿ã¹ã¯ã«ã¯Webstormã䜿çšããå¿ èŠããããŸã:(
åŸ ã£ãŠãŸã
ãªããŸã ããããµããŒãããŠããªãã®ã§ããïŒ åžå Žã§åã圹å²ãæããvscodeãã©ã°ã€ã³ã¯ãããŸããïŒ
@sshsu
ç§ã¯ééã£ãŠãããããããŸããããå¶éèŠå ã«ã¯ãšãã£ã¿ãŒæ©èœãæ¬ ããŠãããšæããŸãã ãã©ã°ã€ã³ãæžãããšãå¯èœã§ããã°ããã§ã«ãã©ã°ã€ã³ããããŸã
ç§ã¯ééã£ãŠãããããããŸããããå¶éèŠå ã«ã¯ãšãã£ã¿ãŒæ©èœãæ¬ ããŠãããšæããŸãã ãã©ã°ã€ã³ãæžãããšãå¯èœã§ããã°ããã§ã«ãã©ã°ã€ã³ããããŸã
ãããã ç§ã¯èªç±ãªæéã«ããŒãžãã©ã°ã€ã³ãå®è£ ãå§ããŸããããæ¬åœã«æ¬ ããŠããããšãããã£ãã®ã¯https://github.com/microsoft/vscode/issues/85682ã ãã§ãã
ããããç§ã¯ãªãŒãã³ãœãŒã¹ã®ide vscodeã«æ¬åœã«æè¬ããŠããŸãðã ãããè¿œå ããããã¹ãŠã®ãã®ã«æºè¶³ããŠããŸã-ããŒãããã2020ã®äžéš
ãã®æ©èœã¯ããããç»å ŽããŸããïŒ VisualStudioã®ã¡ã€ã³ã©ã€ã³ã«ã¯TFSã§ã®3è éããŒãžããããŸã
ç§ã®æ°ããæ¡åŒµæ©èœVSCodeãGitMergetoolãšããŠè©ŠããŠã¿ãŠãã ããã APIãäžè¶³ããŠããããã«ããã€ãã®æ¬ é¥ããããŸãããç§èªèº«ãé€ããŠããŸã åŠå®çãªãã£ãŒãããã¯ãåãåã£ãŠããŸããã ãã ããææ¡ããã4ãã€ã³ã®ã¬ã€ã¢ãŠãã«ã¯ã3åã®ã¬ã€ã¢ãŠããããããã€ãã®å©ç¹ããããŸãã
ãŸã ããŒã±ãããã¬ã€ã¹ã«ã¯ãããŸããããæåã§ã€ã³ã¹ããŒã«ã§ããŸãã _ããŒã±ãããã¬ã€ã¹ã§å©çšã§ããããã«ãªã
ãã®æ©èœãååŸããããwebstormãåé€ããŸãã
éåžžã«å¿ èŠïŒ+ 1ïŒ
ããã¯çŽ æŽãããæ©èœã«ãªããŸã<3
äžæçãªè§£æ±ºçãšããŠã httpsïŒ//editor.mergely.comãªã©ã®ãªã³ã©ã€ã³ããŒã«ã䜿çšã
æ°å¹Žåããããã«ã³ã¡ã³ãããããä»ã®äººãšåãããšãèšã£ãŠããŸãã代æ¿ã®3ãŠã§ã€ããŒãžãã¥ãŒã¯çŽ æŽããããšæããŸãããå®éã«ã¯ãgitãé 眮ããããã¹ããããæåéãåãªãã¹ãã³ã§ããããããã®æäœéã®æ¹æ³ã奜ã¿ãŸããããã®ã
ç§ãèšãããã®ã¯ãããã¯VSCodeã䜿çšãã人ã«ãšã£ãŠããããã«ãŒãã§ãã£ãŠã¯ãªããªããšããããšã§ãã gitã€ã³ã¿ã©ã¯ã·ã§ã³ã®ããã«IDEAIDEã«æ»ãã®ã§ã¯ãªããè©ŠããŠã¿ãŠãã ããã ïŒç§ããå§ãããå¯äžã®æ¡åŒµæ©èœã¯Git Graphã§ãïŒ
æãåèã«ãªãã³ã¡ã³ã
ããã¯éåžžã«åªããæ©èœã§ããç§ã¯æ¥åžžæ¥åã«
VSCode
ã䜿çšããŠããŸãããã€ã³ã¿ã©ã¯ãã£ãæ§ãšäœ¿ãããããããããŒãžã®ç«¶åã解決ããå¿ èŠãããå Žåã¯WebStorm
ã䜿çšããããšããããããŸãã