[B! git] kssmã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

kssm id:kssm

gitã«é–¢ã™ã‚‹kssmã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (37)

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

${{author_name}}$
{{author_name}}{{created}}
{{ #comment }}{{ comment }}{{ /comment }}
- {{ label }}

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

git-flowã§ã‚‚github flowã§ã‚‚ãªã„ã€Gitæœ¬å®¶æŽ¨å¥¨ã®ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼
ã“ã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆã¯Â git.gitÂ (è¨³æ³¨: Git ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®gitãƒªãƒã‚¸ãƒˆãƒª) ãã‚Œè‡ªèº«ã§ä½¿ã‚ã‚Œã¦ã„ã‚‹ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã®è¦ç´ ã‚’æ›¸ãã¨ã‚ã€ ãã‚Œã‚’ä½¿ã„ãŸã„ã¨æ€ã‚ã›ã‚‹ã“ã¨ã‚’æ„å›³ã—ã¦ã„ã¾ã™ã€‚ å¤šãã®ã‚¢ã‚¤ãƒ‡ã‚¢ãŒä¸€èˆ¬ã«é©ç”¨ã§ãã¾ã™ãŒã€ ã‚ˆã‚Šå°‘äººæ•°ãŒå‚åŠ ã™ã‚‹å°ã•ãªãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ å®Œå…¨ãªãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã‚’å¿…è¦ã¨ã™ã‚‹ã®ã¯ç¨€ã§ã™ã€‚ ç§ãŸã¡ã¯ã‚¯ã‚¤ãƒƒã‚¯ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ã®ãŸã‚ã«ã²ã¨ã¾ã¨ã¾ã‚Šã®Â ãƒ«ãƒ¼ãƒ«Â ã‚’ã¨ã‚Šã¾ã¨ã‚ã€ æ–‡ç« ã§ãã‚Œãžã‚Œã®ãƒ«ãƒ¼ãƒ«ã¸ã®å‹•æ©Ÿã‚’ä¸Žãˆã¾ã™ã€‚ è¨€è‘‰é€šã‚Šã«ã¨ã‚‰ãªã„ã‚ˆã†ã«ã—ã¦ãã ã•ã„; é‡è¦–ã™ã¹ããªã®ã¯ã€ã“ã®æ–‡æ›¸ã®ã‚ˆã†ãªmanãƒšãƒ¼ã‚¸ã®è¨˜è¿°ã‚ˆã‚Šã‚‚ ã‚ãªãŸãŒãã†ã™ã¹ãç†ç”±ã®æ–¹ã§ã™ã€‚
kssm 2014/02/04
git
ãƒªãƒ³ã‚¯
Gitå…¥é–€ v1.1.0
Frontrend Vol.6 powered by CyberAgent, Inc. http://frontrend.doorkeeper.jp/events/6907 ã§ç™ºè¡¨ã—ãŸãƒ—ãƒ¬ã‚¼ãƒ³è³‡æ–™ã§ã™ã€‚ ã“ã†ã„ã†è³‡æ–™ã«å¯¾ã™ã‚‹æŠ•ã’éŠçš„ãªã®ãŒã©ã†ãªã‚‹ã®ã‹æ°—ã«ãªã£ã¦ã„ãŸã®ã§ã€ã‚‚ã—ã‚ˆã‚ã—ã‘ã‚Œã°ãƒ»ãƒ»ãƒ»ï¼15å††ã‹ã‚‰ã§ãã‚‹ã‚½ãƒ¼ã‚·ãƒ£ãƒ«ã‚«ãƒ³ãƒ‘ã‚µãƒ¼ãƒ“ã‚¹ã ãã†ã§ã™m(_ _)m http://kampa.me/t/dev
kssm 2013/11/21
git
ãƒªãƒ³ã‚¯
Mac ã§ä½¿ãˆã‚‹ git mergetool ã‚’ã„ã‚ã„ã‚è©¦ã—ã¦ã¿ã‚‹ - æº–å‚™ç·¨ | ãã‚“ãªã“ã¨è¦šãˆã¦ãªã„
ã“ã®è¨˜äº‹ã¯ ã™ã”ã„åºƒå³¶ #6 ã§ã®æ´»å‹•ã®ä¸€éƒ¨ã§ã™ã€‚ Git ã§ branch ã‚’ãƒžãƒ¼ã‚¸ã—ãŸã¨ãã«ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆãŒèµ·ãã‚‹ã¨ã€ã“ã‚Œã‚’è§£æ¶ˆã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ãƒ†ã‚ã‚¹ãƒˆã‚¨ãƒ‡ã‚£ã‚¿ã§ãŒã‚“ã°ã‚‹ã®ã¯ã¤ã‚‰ã„ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã‚ˆãã€‚ ãã‚“ãªã¨ãã€ãƒžãƒ¼ã‚¸ã™ã‚‹ãŸã‚ã®ãƒ„ãƒ¼ãƒ«ã‚’ä½¿ã„ãŸã„å ´åˆã‚‚ã‚ã‚Šã¾ã™ã€‚ Git ã« git mergetool ã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ãŒã‚ã£ã¦ã€è¨å®šã—ã¦ãŠã„ãŸãƒ„ãƒ¼ãƒ«ã‚’èµ·å‹•ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ åŒæ§˜ã« å·®åˆ†ã‚’è¦‹ã‚‹ã®ã«GUIãƒ„ãƒ¼ãƒ«ã‚’ä½¿ã„ãŸã„å ´åˆãªã©ã«ã¯ git difftoolã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ã‚‚ã‚ã‚Šã¾ã™ã€‚ åŸºæœ¬çš„ã«ã¯ Mac ã§ä½¿ãˆã‚‹ã‚‚ã®ã‚’ç´¹ä»‹ã—ã¾ã™ãŒã€ãƒžãƒ«ãƒãƒ—ãƒ©ãƒƒãƒˆãƒ•ã‚©ãƒ¼ãƒ ã®ã‚‚ã‚ã‚‹ã®ã§ã€åˆ¥ã®ç’°å¢ƒã§ã‚‚ä½¿ãˆã‚‹ã‚‚ã®ã‚‚ã‚ã‚Šã¾ã™ã€‚ è©¦ã—ãŸãƒ„ãƒ¼ãƒ« opendiff - ç„¡æ–™ Xcode ã«æ·»ä»˜ã•ã‚Œã¦ã„ã‚‹ p4merge - ç„¡æ–™ Qt ediff(emacs) - ç„¡æ–™ Kaleidoscope - æœ‰æ–™ - Coco
kssm 2013/08/26
git
ãƒªãƒ³ã‚¯
http://blog.inouetakuya.info/entry/20120826/1345979787
kssm 2013/06/06
git
ãƒªãƒ³ã‚¯
http://papix.hateblo.jp/entry/2013/05/22/032747
kssm 2013/05/23
pull request

git
ãƒªãƒ³ã‚¯
GitLabã«GitoliteãŒå¿…è¦ãªããªã‚‹ã‚ˆ ã„ã„ã“ã¨ã°ã‹ã‚Šã˜ã‚ƒãªã„ã‘ã©
by @dekokun on 2013/02/19 23:28 Tagged as: GitLab, git. ãƒ—ãƒ©ã‚¤ãƒ™ãƒ¼ãƒˆGitHubãŒæ§‹ç¯‰ã§ãã‚‹(Amazon Linux AMIã«Git + Gitolite + Gitlabã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã€ãƒ—ãƒ©ã‚¤ãƒ™ãƒ¼ãƒˆGitHubã‚’æ§‹ç¯‰ã™ã‚‹)ãªã©ã¨ã—ã¦çµ¶è³›è©±é¡Œæ²¸é¨°ä¸ã€ã€Œè²§è€…ã®GItHub Enterprizeã€ã§ã‚ã‚‹ã¨ã“ã‚ã®GitLabã§ã™ãŒã€æ¬¡ã®ãƒ¡ã‚¸ãƒ£ãƒ¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚¢ãƒƒãƒ—ã§GitoliteãŒä¸è¦ã«ãªã‚‹ã¨ã„ã†å¤§ãƒ‹ãƒ¥ãƒ¼ã‚¹ãŒæ•°æ—¥å‰ã«ç™ºè¡¨ã•ã‚ŒãŸã«ã‚‚ã‹ã‹ã‚ã‚‰ãšã€æ—¥æœ¬èªžã®æƒ…å ±ãŒå…¨ããªã„ã®ã§ãã‚Œã§ã¯ã‚ãŸãã—ã‚ãŒã¨æ€ã„ã¾ã—ã¦ãƒ–ãƒã‚°ã‚’åŸ·ç†ã•ã›ã¦ã„ãŸã ãæ¬¡ç¬¬ã§ã™ã€‚ ã‚ã€ã‚ã¨ã€ç§äº‹ã§æç¸®ã§ã™ãŒä»Šåº¦çµå©šã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã—ãŸã€‚ ã¯ã˜ã‚ã« çš†ã•ã‚“ã€Amazon Linux AMIã«Git + Gitolite + Gitlabã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã€ãƒ—ãƒ©ã‚¤ãƒ™ãƒ¼ãƒˆGitHubã‚’æ§‹
kssm 2013/05/16
git

gitlab
ãƒªãƒ³ã‚¯
å¾©ç¿’ Git: GitHub ã®ãƒ–ãƒ©ãƒ³ãƒã‚’å‰Šé™¤ã™ã‚‹ï¼Ž
å¾©ç¿’ Git: GitHub ã®ãƒ–ãƒ©ãƒ³ãƒã‚’å‰Šé™¤ã™ã‚‹ï¼Ž æ‰‹ãŒæ»‘ã£ã¦ test-2 ãªã‚“ã¦æƒ…ã‘ãªã„åå‰ã®ãƒ–ãƒ©ãƒ³ãƒã‚’ GitHub ã« push ã—ã¦ã—ã¾ã£ãŸï¼Ž ã¨ã‚Šã‚ãˆãšï¼Œãƒãƒ¼ã‚«ãƒ«ã® test-2 ãƒ–ãƒ©ãƒ³ãƒã¯ï¼Œ $ git branch -D test-2 ã§æ¶ˆãˆãŸï¼Žã‚ã¨ã¯ GitHub ã® test-2 ãƒ–ãƒ©ãƒ³ãƒã‚’æ¶ˆã™ã ã‘ã ï¼Ž GitHub ã§ãƒ–ãƒ©ãƒ³ãƒã‚’å‰Šé™¤ã™ã‚‹ãƒœã‚¿ãƒ³ã‚’æŽ¢ã—ã¦ã¿ãŸã®ã ãŒï¼Œï¼Žï¼Žï¼Ž è¦‹ã¤ã‹ã‚‰ãªã„ï¼Žã©ã†ã—ã‚ˆã†ï¼Ž git push ã§ãƒªãƒ¢ãƒ¼ãƒˆã®ãƒ–ãƒ©ãƒ³ãƒã‚’æ›´æ–°git push ã¯ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã«å¤‰æ›´ã‚’åæ˜ ã•ã›ã‚‹ã¨ãã«ã‚ˆãä½¿ã†ã‚³ãƒžãƒ³ãƒ‰ã ï¼Ž é€šå¸¸ã¯ï¼Œ $ git push ã ã‘ã§ã‚³ãƒžãƒ³ãƒ‰ã‚’å®Ÿè¡Œã™ã‚‹ãŒï¼Œã“ã‚Œã¯ï¼Œ $ git push ãƒ—ãƒƒã‚·ãƒ¥å…ˆãƒªãƒã‚¸ãƒˆãƒª ãƒãƒ¼ã‚«ãƒ«ã®ãƒ–ãƒ©ãƒ³ãƒå:ãƒªãƒ¢ãƒ¼ãƒˆã®ãƒ–ãƒ©ãƒ³ãƒå ã‚’çœç•¥ã—ãŸå½¢ã ï¼Žgit push ã¨ã ã‘å®Ÿè¡Œã—ãŸã¨ãã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã¯ï¼Œ $ git pus
kssm 2013/05/02
git
ãƒªãƒ³ã‚¯
ãšããªã—ã€‚ : gitã§pushã—ãŸcommitã‚’å–ã‚Šæ¶ˆã™ - livedoor Blogï¼ˆãƒ–ãƒã‚°ï¼‰
gitã§ãƒªãƒ¢ãƒ¼ãƒˆã®ãƒªãƒã‚¸ãƒˆãƒªã«pushã—ãŸcommitã‚’å–ã‚Šæ¶ˆã—ãŸã„ã¨ãã«ã¯rebaseã‚’ä½¿ã„ã¾ã™ã€‚ git rebase -i HEAD~2 ã¨ã™ã‚‹ã¨ã€ã‚¨ãƒ‡ã‚£ã‚¿ãŒé–‹ã„ã¦éŽåŽ»ï¼’å›žåˆ†ã®ã‚³ãƒŸãƒƒãƒˆæ™‚ã®ã‚³ãƒ¡ãƒ³ãƒˆãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ ã‚³ãƒ¡ãƒ³ãƒˆã®2è¡Œç›®ã‚’å‰Šé™¤ã—ã¦ä¿å˜ã™ã‚‹ã¨ã€å‰å›žã®ã‚³ãƒŸãƒƒãƒˆãŒå–ã‚Šæ¶ˆã•ã‚Œã¾ã™ã€‚ ãã®å¾Œã€ git push origin +master ã™ã‚Œã°ï¼¯ï¼«ã€‚ rebaseã¯ãƒªãƒ¢ãƒ¼ãƒˆãƒ»ãƒãƒ¼ã‚«ãƒ«å…±ã«HEADã®ä½ç½®ãŒå¤‰æ›´ã•ã‚Œã¾ã™ã€‚ ãƒªãƒ¢ãƒ¼ãƒˆã®ã¿ã€ã¾ãŸã¯ãƒãƒ¼ã‚«ãƒ«ã®ã¿ã®å ´åˆã¯ ï¼œãƒªãƒ¢ãƒ¼ãƒˆã®ã¿ï¼ž git push -f origin HEAD^:master ï¼œãƒãƒ¼ã‚«ãƒ«ã®ã¿ï¼ž git reset HEAD^ ãƒãƒ¼ã‚«ãƒ«ã®ã¿ã‚³ãƒŸãƒƒãƒˆã‚’å–ã‚Šæ¶ˆã—ãŸå ´åˆã€ãƒªãƒ¢ãƒ¼ãƒˆã®ã»ã†ãŒä¸–ä»£ãŒé€²ã‚“ã§ã„ã‚‹ã“ã¨ã«ãªã‚‹ã®ã§ã€resetå¾Œã«pushã—ã‚ˆã†ã¨ã™ã‚‹ã¨ã‚¨ãƒ©ãƒ¼ã«ãªã‚Šã¾ã™ã€‚ ãã®å ´åˆã¯ä¸€åº¦rebaseã—ã¦ä¸–ä»£ã‚’åˆã‚ã›ã‚‹å¿…è¦ãŒã‚
kssm 2013/04/21
git
ãƒªãƒ³ã‚¯
layer8.sh
This domain may be for sale!
kssm 2013/04/10
git
ãƒªãƒ³ã‚¯
Webãƒ‡ã‚¶ã‚¤ãƒŠãƒ¼ã‚‚Gitä½¿ã†ã¨ã„ã„ã‚ˆã£ã¦è©± | Cherry Pie Web
â€»ã“ã®è¨˜äº‹ã§ã¯ã€ŒWebãƒ‡ã‚¶ã‚¤ãƒŠãƒ¼ã€ã¯ã€ã€ŒãƒŽãƒ³ãƒ—ãƒã‚°ãƒ©ãƒžã€ã®æ„å‘³ã§ä½¿ã£ã¦ã„ã¾ã™ã€‚ psdã€ai ãªã©ã®ææ–™ãƒ‡ãƒ¼ã‚¿ã®ç®¡ç†ã§ã¯ãªãã€ã‚µãƒ¼ãƒãƒ¼ã«ã‚¢ãƒƒãƒ—ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ç®¡ç†ã®è©±ã§ã™ã€‚ ã‚µãƒ«ã§ã‚‚ã‚ã‹ã‚‹ã¨ã„ã‚ã‚Œã¦ã‚‚ã€ã‚„ã£ã±ã‚Šã‚ã‹ã‚‰ãªã„ãƒ»ãƒ»ãƒ» Webåˆ¶ä½œã‚’ã‚„ã£ã¦ã„ã‚‹äººã¯ã€å°‘ãªã‹ã‚‰ãšãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã®è©±ã‚’èžã„ãŸã“ã¨ãŒã‚ã‚‹ã¨æ€ã„ã¾ã™ã€‚ ç‰¹ã«Gitï¼ˆã‚®ãƒƒãƒˆï¼‰ã£ã¦ã„ã†ã®ã¯ã€å†…å®¹ã¾ã§çŸ¥ã‚‰ãªãã¦ã‚‚åå‰ãã‚‰ã„ã¯èžã„ãŸã“ã¨ãŒã‚ã‚Šã¾ã™ã‚ˆãã€‚ ã§ã€ãƒãƒƒãƒˆä¸Šã§ã¯ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã®ãƒ¡ãƒªãƒƒãƒˆã«é–¢ã™ã‚‹ãƒ–ãƒã‚°è¨˜äº‹ãªã‚“ã‹ã‚‚ãŸãã•ã‚“ã‚ã£ã¦ã€å¤‰æ›´å±¥æ´ã‚’ãŸã©ã‚Œã‚‹ã¨ã‹ã€è¤‡æ•°äººã§åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä¿®æ£ã—ãŸã‚Šã¨ã„ã£ãŸæ™‚ã®ãƒˆãƒ©ãƒ–ãƒ«ã«å¯¾å¿œã§ãã‚‹ã¨ã‹ã€ãªã‚“ã‹ä¾¿åˆ©ãã†ã ãªãƒ¼ã¨ã¯æ€ã£ã¦ã„ãŸã‚ã‘ã§ã™ãŒã€ãšãƒ¼ã£ã¨å°Žå…¥ã¯è¦‹é€ã£ã¦ãã¾ã—ãŸã€‚ ãã®ç†ç”±ã¯ãƒ»ãƒ»ãƒ» ã€ŒGitå…¥é–€ã€ã¨ã‹æ›¸ã„ã¦ã‚ã‚‹è¨˜äº‹ã‚’èªã‚“ã§ã‚‚å°Žå…¥æ–¹æ³•ãŒæ›¸ã„ã¦ã‚ã‚‹ã ã‘ã§ã€å®Ÿéš›ã«ä½¿ã†ã‚·ãƒãƒ¥ã‚¨ãƒ¼ã‚·ãƒ§ãƒ³ãŒæ€ã„
kssm 2013/04/01
git
ãƒªãƒ³ã‚¯
githubã§Pull Requestã‚’æ‰‹å‹•ã§å‡¦ç†ã™ã‚‹ - slowjet
Auto Merge Pull Requestã¿ãŸã„ãªã®ã‚’ä½¿ã‚ãªã„ã§ã‚„ã‚‹ $ git remote add [username] [repository] ã§ãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ã£ã¦ãã‚ŒãŸäººã®ãƒªãƒ¢ãƒ¼ãƒˆã‚’è¿½åŠ ã—ãŸã‚‰ -v ã§è¿½åŠ ã§ãã¦ã‚‹ã‹ç¢ºèª $ git remote -v ä»»æ„ã®ãƒ–ãƒ©ãƒ³ãƒãƒãƒ¼ãƒ ã§ãƒ–ãƒ©ãƒ³ãƒã‚’åˆ‡ã£ã¦ãŠã $ git branch [branchname] $ git checkout [branchname] ãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ã£ã¦ãã‚ŒãŸäººã®ãƒªãƒ¢ãƒ¼ãƒˆã‹ã‚‰Pullã™ã‚‹ $ git pull [username] "hogehoge"ã§ãƒ–ãƒ©ãƒ³ãƒãŒåˆ‡ã‚‰ã‚Œã¦ã‚‹å ´åˆã¯ $ git pull [username] hogehoge å•é¡Œãªã‘ã‚Œã°masterã«ç§»å‹•ã—ã¦ $ git checkout master $ git merge [branchname] Pushã—ã¦çµ‚ã‚ã‚Š $ git
kssm 2013/03/27
git
ãƒªãƒ³ã‚¯
Gitã®ä½¿ã„æ–¹ã‚’è¦šãˆã‚ˆã†ã‹ãª2 : ESTONblog
æ˜¨æ—¥ã¯ã§ããŸã‚ˆã†ãªæ°—ãŒã™ã‚‹ã®ã«ã©ã†ã—ã¦ã§ããªã„ã®ã‚³ãƒŸãƒƒãƒˆâ€¦ ã‚ã€ã“ã®ã‚¨ãƒ³ãƒˆãƒªã¯ã“ã®å‰ã®ã‚¨ãƒ³ãƒˆãƒªã‚’èªã¾ãªã„ã¨ã‚ã‘ãŒã‚ã‹ã‚Šã¾ã›ã‚“ã®ã§ã€ä¾‹å¤–çš„ã«çŠ¶æ³ã‚’èª¬æ˜Žã—ã¾ã™ã¨ ã€ŒGitã§ã‚³ãƒŸãƒƒãƒˆã—ã‚ˆã†ã¨ã—ãŸã‚‰ vi ãŒç«‹ã¡ä¸ŠãŒã‚‰ãšãƒã‚°ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒæ®‹ã›ãªã„ã€ã¤ã¾ã‚Šã€ã‚³ãƒŸãƒƒãƒˆã§ããªã„ã€ãªã‚“ã§ï¼Ÿã€ ã¨ã„ã†æ„Ÿã˜ã§ã™ãã€‚ ãã®ã‚¨ãƒ©ãƒ¼ãŒã“ã¡ã‚‰ã€‚ ------------------------------------------------- git commit error: cannot run /usr/bin/vi: No such file or directory error: There was a probl em with the editor '/usr/bin/vi'. Please supply the message using either -m or -F option. ---------
kssm 2013/01/23
git commit, git mergeã§ã®viã®error

git
ãƒªãƒ³ã‚¯
Gitã‚³ãƒžãƒ³ãƒ‰ç·é¸æŒ™ - Qiita
ã“ã‚“ã«ã¡ã¯ id:akiyoko ã§ã™ã€‚ ä»Šå›žã¯ã€Git Advent Calendar 2012 ã® 16æ—¥ç›®ã®è¨˜äº‹ã«ãªã‚Šã¾ã™ã€‚ ä»Šæ—¥ã¯ç·é¸æŒ™ã®æ—¥ã§ã™ã‚ˆãã€‚ ãã†ã€Gitã‚³ãƒžãƒ³ãƒ‰ç·é¸æŒ™ã§ã™ã‚ˆï¼ æ¥å‹™ã§ä¸€å¹´é–“ãŒã£ã¤ã‚Š Git ã‚’ä½¿ã„ã¾ãã£ãŸçµŒé¨“ã‹ã‚‰ã€ç‹¬æ–ã¨åè¦‹ã«ã‚ˆã‚Šã€æœ¬å½“ã«ä½¿ãˆã‚‹ Gitã‚³ãƒžãƒ³ãƒ‰ã‚’ç·é¸æŒ™ï¼ˆãƒ©ãƒ³ã‚ãƒ³ã‚°ï¼‰ã—ãŸã„ã¨æ€ã„ã¾ã™ï¼ ã¡ãªã¿ã«ã€ä¸€å¹´é–“é–¢ã‚ã£ã¦ããŸã®ã¯ã€ ã¨ã„ã†ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ã—ãŸã€‚ ã•ã¦ã•ã¦ã€å ‚ã€…ã®ã‚»ãƒ³ã‚¿ãƒ¼ã‚’é£¾ã‚‹ã®ã¯ãƒ»ãƒ»ï¼ï¼Ÿ ç¬¬ 1 ä½ã€€git checkout ãƒãƒãƒ¼ãƒ³ï¼ ã¿ã‚“ãªå¤§å¥½ã git checkout ãŒã€æ–‡å¥ãªã—ã®ç¬¬ 1 ä½ã§ã™ï¼ ã‚ˆãè€…ï¼ˆSVNã‚’ä½¿ã£ã¦ããŸäººï¼‰ã‹ã‚‰ã¯èª¤è§£ã•ã‚Œã‚„ã™ã„ã‘ã©ã€ã„ã‚ã‚“ãªå ´é¢ã§æ´»èºã™ã‚‹ã‚»ãƒ³ã‚¿ãƒ¼ãªç«‹ã¡ä½ç½®ã€ãã‚ŒãŒ git checkout ãªã‚“ã§ã™ã‚ˆããƒ¼ã€‚ ã€Œcheckout ã®ã“ã¨ã¯å«Œã„ã§ã‚‚ã€Git ã®ã“ã¨ã¯å«Œã„ã«ãªã‚‰ãªã„ã§ãã ã•ã„ï¼ã€
kssm 2012/12/17
git
ãƒªãƒ³ã‚¯
SparkleShare - Self hosted, instant, secure file sync
Linux You can install the package from your distribution (likely old and not updated often), but we recommend to get our Flatpak with automatic updates to always enjoy the latest and greatest: flatpak remote-add flathub https://flathub.org/repo/flathub.flatpakrepo flatpak install flathub org.sparkleshare.SparkleShare How does it work? SparkleShare creates a special folder on your computer. You can
kssm 2012/12/12
git

webã‚µãƒ¼ãƒ“ã‚¹
ãƒªãƒ³ã‚¯
Undo a merge by pull request?
Someone accepted a pull request which they shouldn't have. Now we have a bunch of broken code merged in. How do you undo a pull request? I was just going to revert the changes to the commit just before the merge, but I noticed that it merged in a bunch of commits. So now there are all these commits from this person from days before the merge. How do you undo this?
kssm 2012/11/27
auto merge å–ã‚Šæ¶ˆã— [github]

git
ãƒªãƒ³ã‚¯
ã€Œgithugã€ã§gitã®åŸºæœ¬æ“ä½œã‚’ç®—æ•°ãƒ‰ãƒªãƒ«ã¿ãŸã„ã«å¦ã¼ã†ï¼ | Act as Professional
GitHubã®ã‚¤ãƒ™ãƒ³ãƒˆã§ã‚ã‚‹ã€ŒThe GitHub poweredby Agileæ¸‹è°· ã€œæ—¥æœ¬ã®SOCIAL CODINGã®ä»Šã‚’è¦‹ã‚‹ã€œã€ã®æ‡‡è¦ªä¼šã‚’å—ä»˜å§‹ã‚ã¾ã—ãŸ@HIROCASTERã§ã”ã–ã„ã¾ã›ã†ã€‚ ã‚¤ãƒ™ãƒ³ãƒˆå‚åŠ è€…ä»¥å¤–ã§ã‚‚å‚åŠ å¯èƒ½ã®ãŸã‚ã€ã‚¤ãƒ™ãƒ³ãƒˆã¯è£œæ¬ ã ã£ãŸã‘ã©ã€ã©ã†ã„ã†ãµã†ã«GitHubã‚’ä½¿ã£ã¦ã„ã‚‹ã®ã‹èžããŸã„äººã¯ã€ã”å‚åŠ ãã ã•ã„ã€‚ï¼ˆã‚¤ãƒ™ãƒ³ãƒˆå‚åŠ è€…å„ªå…ˆã§ã€ç©ºæ°—èªã‚“ã§ç™»éŒ²ã—ã¦ãã ã•ã„ï¼‰ ã‚¤ãƒ™ãƒ³ãƒˆã§ã¯GitHubã®è©±ã‚’ã™ã‚‹ã®ã§ã€GitãŒä½¿ãˆã‚‹ã“ã¨ãŒå‰æã«ãªã£ã¦ã„ã¾ã™ã€‚ ãã“ã§ã€Gitã®åŸºæœ¬æ“ä½œæ–¹æ³•ã‚’å¦ã¹ã‚‹ã€Œgithugã€ã‚’ç´¹ä»‹ã—ã¾ã™ã€‚ githug Gazler/githug ã€Œgithugã€ã¯gitã®åŸºæœ¬æ“ä½œã‚’å®Ÿè·µçš„ã«å¦ã¶ãŸã‚ã®è‰¯ã„ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€‚ ç‰¹ã«ä»–ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã‚’ä½¿ã£ãŸã“ã¨ã®ã‚ã‚‹äººãŒgitã®åŸºæœ¬æ“ä½œã ã‘ã‚’å¦ã¶ã ã‘ãªã‚‰ã¡ã‚‡ã†ã©è‰¯ã„ã€‚ ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« gemã§å…¬é–‹ã•ã‚Œã¦ã„ã‚‹ã®
kssm 2012/11/03
git

programming
ãƒªãƒ³ã‚¯
kuroigamen.com
This domain may be for sale!
kssm 2012/11/03
git
ãƒªãƒ³ã‚¯
Gitã®ä½¿ã„æ–¹ãƒ¡ãƒ¢ - sotarokã®ãŠå‹‰å¼·
Web+DB Press 50å·ã«è¼‰ã£ã¦ã‚‹Gitã®ç‰¹é›†ãŒã™ã”ãã‚ã‹ã‚Šã‚„ã™ã‹ã£ãŸï¼Ž ã§ï¼Œã¾ã‚ï¼ŒãŸã èªã‚“ã§ã‚‹ã¨é ã«å…¥ã£ã¦ã“ãªã„ã‹ã‚‰é ã«å…¥ã‚ŒãŸã„ã¨ã“ã‚ã ã‘ãƒ¡ãƒ¢ï¼Ž git add ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã«è¿½åŠ ã™ã‚‹ç³»ï¼Ž ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã¯ï¼Œæ¬¡ã®ã‚³ãƒŸãƒƒãƒˆã§ã‚³ãƒŸãƒƒãƒˆã™ã‚‹å¤‰æ›´ã‚’è¨˜éŒ²ã—ãŸã‚‚ã®ï¼Ž git add <paths> <paths> ã‚’ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã«è¿½åŠ git add . ç¾åœ¨ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªä»¥ä¸‹ã®ã™ã¹ã¦ã®å¤‰æ›´ãƒ•ã‚¡ã‚¤ãƒ«/æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã«è¿½åŠ git add -u ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‹ã‚‰å¤‰æ›´ã•ã‚Œã¦ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´ã‚’ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã«è¿½åŠ git add -A -u + æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ« git add -p ãŸã¨ãˆã° index.html ã®å¤‰æ›´ç®‡æ‰€(hunk)ãŒ2ã¤ã‚ã£ãŸã¨ã—ãŸã‚‰ï¼Œ ãã®2ã¤ã®ã†ã¡ç‰‡æ–¹ã ã‘ã‚’ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã«è¿½åŠ ã¿ãŸã„ãªã“ã¨ãŒã§ãã‚‹ï¼ˆå¯¾è©±å½¢å¼ã§ï¼‰ git commit ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ç³»ï¼Ž git comm
kssm 2012/10/29
git
ãƒªãƒ³ã‚¯
git-åŠ©ã‘ã¦ã¨ã„ã†ã™ã”ãä¾¿åˆ©ãªã‚¨ã‚¤ãƒªã‚¢ã‚¹ã‚’ä½œã£ãŸ - é³©èˆŽ
ã“ã‚“ã°ã‚“ã¯ï¼æš‘ã„ï¼ ã¨ã„ã†ã“ã¨ã§ä»Šæ—¥ã¯gitã®ã™ã”ãä¾¿åˆ©ãªã‚¨ã‚¤ãƒªã‚¢ã‚¹ã‚’ä½œã‚Šã¾ã—ãŸã€‚ Git-åŠ©ã‘ã¦ https://github.com/rosylilly/git-tasukete ã¨ã„ã†ã€è¶…ä¾¿åˆ©ã‚³ãƒžãƒ³ãƒ‰é›†ã§ã™ã€‚ ä½¿ã„æ–¹ã¯ãƒ›ãƒ¼ãƒ ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚ãŸã‚Šã«ã‚¯ãƒãƒ¼ãƒ³ã—ã¦ãã¦ã€ãƒ‘ã‚¹ã‚’é€šã—ã¦ãŠãã ã‘ã§ã™ã€‚ ã™ã‚‹ã¨ã‚ã‚‰ä¸æ€è°ã€ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã« $ git åŠ©ã‘ã¦ ã¨æ‰“ã¤ã ã‘ã§ã€åŠ©ã‹ã‚ŠãŸã„æ™‚ã®å ´åˆãŒãƒªã‚¹ãƒˆã§å‡ºã¦ãã¾ã™ã€‚ å¾Œã¯ãã®ã†ã¡ã€ç›®çš„ã®çŠ¶æ³ã®ãƒ¢ãƒŽã‚’ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã«ã‚³ãƒ”ãƒšã™ã‚‹ã ã‘ã§ã™ã€‚ã»ã‚‰ã $ git mergeã‚’å–ã‚Šæ¶ˆã—ãŸã„ ã¯ã„ã€ãƒžãƒ¼ã‚¸ãŒå–ã‚Šæ¶ˆã›ã¾ã—ãŸã€‚ã‚ˆã‹ã£ãŸã‚ˆã‹ã£ãŸãƒ¼ï¼ ã“ã‚“ãªå›°ã£ãŸå ´åˆã«ã‚‚å¯¾å¿œã—ã¦ãã ã•ã„ï¼ã¨ã„ã†ã®ã¯GitHubã®issueã‹ã€ã‚³ãƒ¡ãƒ³ãƒˆæ¬„ã«ã¦å—ã‘ä»˜ã‘ã¦ã¾ã™ï¼
kssm 2012/05/06
git
ãƒªãƒ³ã‚¯
ã‚µãƒ¼ãƒ“ã‚¹çµ‚äº†ã®ãŠçŸ¥ã‚‰ã› - NAVER ã¾ã¨ã‚
ã‚µãƒ¼ãƒ“ã‚¹çµ‚äº†ã®ãŠçŸ¥ã‚‰ã› NAVERã¾ã¨ã‚ã¯2020å¹´9æœˆ30æ—¥ã‚’ã‚‚ã¡ã¾ã—ã¦ã‚µãƒ¼ãƒ“ã‚¹çµ‚äº†ã„ãŸã—ã¾ã—ãŸã€‚ ç´„11å¹´é–“ã€NAVERã¾ã¨ã‚ã‚’ã”åˆ©ç”¨ãƒ»ã”æ„›é¡§ã„ãŸã ãèª ã«ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã—ãŸã€‚
kssm 2012/04/26
git
ãƒªãƒ³ã‚¯
1 2 æ¬¡ã®ãƒšãƒ¼ã‚¸