gitã§pullã™ã‚‹ã¨ã‚¨ãƒ©ãƒ¼ãŒã§ã‚‹ - White scenery @showyou, hatenagitã§åˆ¥ã‚“ã¨ã“ã«ã‚るソースをpullã—よã†ã¨ã™ã‚‹ã¨ã€ error: Entry 〜 not uptodate. Cannot merge. ã¨ã‹è¨€ã£ã¦è‡ªå‹•mergeã™ã‚‰ã§ããªã„。上ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã§ããã£ã¦ã‚‚ファイルを消ã›çš„ãªã®ãŒã™ã出ã¦ãã¦ã€ãã‚Œã˜ã‚ƒãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†æ„味ãªã„ã˜ã‚ƒã‚“ï¼ã¨ã„ã†æ„Ÿã˜ã ã£ãŸã®ã ã‘ã©ã€æ¬¡ã®ãƒ¬ã‚¹ã§ã‚ˆã†ã‚„ãç†ç”±ãŒã‚ã‹ã£ãŸã€‚ http://pc11.2ch.net/test/read.cgi/tech/1228366972/491-492 491 ：デフォルトã®åç„¡ã—ã•ã‚“：2009/02/20(金) 20:30:35 $ git co master $ git merge experimental error: Entry 'foo/bar/README' not uptodate. Cannot merge. fatal: merging of trees a3595041
{{#tags}}- {{label}}
{{/tags}}