gist上ã®forkã‚’mergeã™ã‚‹ - ãŸã ã®ã«ã£ã(2009-03-31)â– gist上ã®forkã‚’mergeã™ã‚‹ ã“ãªã„ã é©å½“ã«æ›¸ã„ãŸã‚¹ã‚¯ãƒªãƒ—トãŒno6vã•ã‚“ã«ã‚ˆã£ã¦forkã•ã‚ŒãŸã€‚ã›ã£ã‹ããªã®ã§gitã§ã®ãƒ‘ッãƒã®å–ã‚Šè¾¼ã¿ã‚’ã‚„ã£ã¦ã¿ã‚‹ã€‚gistも普通ã®gitãªãƒªãƒã‚¸ãƒˆãƒªãªã®ã§ã€æ“作ã¯åŒã˜ã€‚ リモートリãƒã‚¸ãƒˆãƒªã‚’指定ã—ã¦ã„ããªã‚Špullã™ã‚‹ã®ã‚‚ã„ã„ã®ã ã‘ã©ã€ã¡ã‚ƒã‚“ã¨å·®åˆ†ã‚’確èªã—ã¦ã‹ã‚‰mergeã™ã‚‹ãªã‚‰ã€ã¾ãšã¯remoteã«åŠ ãˆã¦ã‹ã‚‰fetchãªã‚“ã ã‚ã†ã€‚ã¨ã„ã†ã“ã¨ã§ã€no6vã¨ã„ã†åå‰ã§remoteリãƒã‚¸ãƒˆãƒªã‚’作æˆã—ã¦ã€ãã“ã«fetch: % cd src/mobile_supers % git remote add no6v git://gist.github.com/87620.git % git fetch no6v remote: Counting objects: 5, done. remote: Compressing objects: 100% (
å®‰å…¨åŠ å¯†æ£€æµ‹
Keep either file in merge conflicts
ã©ã†ã«ã‹ã—ãªãゃã„ã‘ãªã„commit - Yappo::タワシ
{{#tags}}- {{label}}
{{/tags}}