engineering
å¿æ´ã®ã»ã©ããããããé¡ããããã¾ãï¼
æ°åããï¼å¹´ã¨ï¼ã¶æãçµã¡ãåéã®ç¾è·ã®å¤ç¶æ¥æ°ãããã¾ã§ã§æé·ã«ãªã£ãã®ã§ãç¥ãããã¾ããã å¤ç¶ãé廿é·è¨é²ãã¿ããªã«ç¥ã£ã¦ããã£ãããã£ã¡ãæ¥ãããããã¨ãªãã ãã©ããã£ã¡ãå¬ããã¦ãå°ãæ³£ããããé°æ§ã§æ¥½ãããã£ã¦ã¾ãã#èªä½ã®å¤â¦
meldãgitã®ãã¼ã¸ãã¼ã«ã¨ãã¦ã¤ããã¨ãã«ã¯ã.gitconfigã«å°ãã ãè¨å®ãå¿ è¦ã [diff] tool = meld [merge] tool = meld [mergetool "meld"] cmd = meld $LOCAL $MERGED $REMOTE #keepBackup = false # if you don't like the backup file ã³ã³ããªã¯ãâ¦
åæ© ãã¨ãã¨, macã§bonjourã£ã¦ãããã¤ã«ãã£ã¦*.localã¨ããååã§åå解決ãã§ããããã«ãªã£ã¦ããã¨ããç¥èã¨ãåæ§ã®ãã¨ãlinuxã§ã¯avahi-daemonã¨ãããã®ãã¤ã³ã¹ãã¼ã«ãããã¨ã«ãã£ã¦ã§ããã¨ãããã¨ã¯ç¥ã£ã¦ããããããããã®ä»çµã¿ã«ã¤ãâ¦