git :: 手元(working directory)ã®å¤‰æ›´ã‚’ commit ã›ãšã«ã€pull ã—ãŸã„時 [Tipsã¨ã„ã†ã‹ãƒ¡ãƒ¢]手元(working directory)ã®å¤‰æ›´ã‚’ commit ã›ãšã« pull ã—よã†ã¨ã™ã‚‹ã¨ä¸‹è¨˜ã®ã‚¨ãƒ©ãƒ¼ã§æ€’られã¾ã™ã€‚ error: Your local changes to the following files would be overwritten by merge: path/to/file Please, commit your changes or stash them before you can merge. Aborting ãã‚“ãªæ™‚㯠stash (変更を一時的ã«éš ã™)ã—ã¦ã‹ã‚‰ pull ã—ã¾ã™ã€‚ æ‰‹é †ã¨ã—ã¦ã¯ä¸‹è¨˜ã«ãªã‚Šã¾ã™ã€‚ 1. stash save: ç¾åœ¨ã®çŠ¶æ…‹ã‚’ä¿å˜ã—ã€git 上ã‹ã‚‰å¤‰æ›´ç®‡æ‰€ã‚’éš ã—ã¾ã™ã€‚ $ git stash save <コメント> Saved working directory and index state On master:
Git submodule ã®åŸºç¤Ž - Qiita
{{#tags}}- {{label}}
{{/tags}}