[B! dvcs] aroma_blackã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

aroma_black id:aroma_black

dvcsã«é–¢ã™ã‚‹aroma_blackã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (8)

${{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 ãƒãƒ¼ãƒ ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼: ãƒžãƒ¼ã‚¸ (merge)ã€ãã‚Œã¨ã‚‚ãƒªãƒ™ãƒ¼ã‚¹ (rebase) ? | Atlassian Japan å…¬å¼ãƒ–ãƒã‚° | ã‚¢ãƒˆãƒ©ã‚·ã‚¢ãƒ³æ ªå¼ä¼šç¤¾
è³ªå•ã¯ç°¡å˜ã§ã™ã€‚git ã¨ ãƒ•ã‚£ãƒ¼ãƒãƒ£ãƒ¼ãƒ–ãƒ©ãƒ³ãƒ ã‚’åˆ©ç”¨ã—ã¦ã„ã‚‹ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ãƒãƒ¼ãƒ ã«ã¨ã£ã¦ã€å®Œäº†æ¸ˆã¿ã®ä½œæ¥ã‚’é–‹ç™ºã®ãƒ¡ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³ã«å–ã‚Šè¾¼ã‚€æœ€è‰¯ã®æ–¹æ³•ã¯ä½•ã§ã—ã‚‡ã†ã‹ï¼Ÿã“ã‚Œã¯ã€ç¢ºå›ºãŸã‚‹æ„è¦‹ã‚’æŒã¤ä¸¡é™£å–¶ã«ã‚ˆã£ã¦ç¹°ã‚Šè¿”ã—å±•é–‹ã•ã‚Œã¦ã„ã‚‹è°è«–ã®ä¸€ã¤ã§ã™ãŒã€ã‚„ã¯ã‚Šè°è«–ã«ã¯æœ€ä½Žé™ã®é…æ…®ã‚’æŒã£ã¦å¯¾å¿œã—ãŸã„ã‚‚ã®ã§ã™ã€‚ (ãã®ä»–ã®æ¿€ã—ã„è°è«–ã®ä¾‹ã¨ã—ã¦ã¯ã“ã‚ŒãŒã‚ã‚Šã¾ã™: The Internet)ã€‚ ãƒªãƒ™ãƒ¼ã‚¹ã‚’è¡Œã£ã¦ã€ãƒªãƒã‚¸ãƒˆãƒªã®å±¥æ´ã‚’ãƒ•ãƒ©ãƒƒãƒˆã‹ã¤ã‚¯ãƒªãƒ¼ãƒ³ã«ä¿ã¤ã¹ãã§ã—ã‚‡ã†ã‹ï¼Ÿãã‚Œã¨ã‚‚ã€å¯èªæ€§ã¨æ˜Žæ™°ã•ã‚’çŠ ç‰²ã«ã™ã‚‹äº‹ã§ãƒˆãƒ¬ãƒ¼ã‚µãƒ“ãƒªãƒ†ã‚£ã‚’å¾—ã‚‰ã‚Œã‚‹ã€ãƒžãƒ¼ã‚¸ã‚’è¡Œã†ã¹ãã§ã—ã‚‡ã†ã‹ï¼Ÿ( ãƒ•ã‚¡ã‚¹ãƒˆãƒ•ã‚©ãƒ¯ãƒ¼ãƒ‰ ãƒžãƒ¼ã‚¸ã‚’ç¦æ¢ã™ã‚‹ãªã©ã€‚) è°è«– ã“ã®ãƒˆãƒ”ãƒƒã‚¯ã¯ã€vim ã¨ Emacs ã‚„ Linux ã¨ BSD ã»ã©ã¾ã§ã«ã¯æœ‰åãªè«–äº‰ã®çš„ã¨ã¯ãªã£ã¦ã„ãªã„ã‚‚ã®ã®ã€åŒæ–¹å…±ã«é æ…®ãªãæ„è¦‹ã‚’è¿°ã¹åˆã£ã¦ã„ã¾ã™ã€‚ all-things-git ã«
aroma_black 2014/02/19
rebaseã¯1æœ¬ç·šã®å±¥æ´ãŒæ¬²ã—ã„ã‹ã¤ãƒ¡ãƒ³ãƒãƒ¼ã«gitã®æ“ä½œã‚¹ã‚ãƒ«ãŒã‚ã‚‹å ´åˆã§mergeã¯å®‰å…¨ã«ãƒ–ãƒ©ãƒ³ãƒã‚’é‹ç”¨ã—ãŸã„å ´åˆã«ã™ã‚‹

git

dvcs
ãƒªãƒ³ã‚¯
Free Mercurial and Git Client for Windows and Mac | Atlassian SourceTree
A free Git client for Windows and Mac Sourcetree simplifies how you interact with your Git repositories so you can focus on coding. Visualize and manage your repositories through Sourcetree's simple Git GUI. Simple for beginners Say goodbye to the command line - simplify distributed version control with a Git client and quickly bring everyone up to speed. Powerful for experts Perfect for making ad
aroma_black 2013/03/21
dvcs

Windows

app
ãƒªãƒ³ã‚¯
Bazaarå…¥é–€ã‚»ãƒƒã‚·ãƒ§ãƒ³ â€” Bazaarã‚¹ã‚¿ãƒ¼ãƒˆã‚¢ãƒƒãƒ—ã‚¬ã‚¤ãƒ‰ v0.0.1 documentation
åŸºæœ¬ç”¨èªžã®ã¯ãªã—Â¶ Bazaar ã‚’ã¯ã˜ã‚ã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚½ãƒ•ãƒˆã§ã¯ã€åè©žã¨ã€ ãã®åè©žãŒæŒ‡ã™ã‚‚ã®ã‚’ä½œã‚‹æ“ä½œã®å‹•è©žãŒã€åŒã˜å˜èªžã«ãªã£ã¦ã„ã‚‹ã“ã¨ãŒã‚ˆãã‚ã‚Šã¾ã™ã€‚ å…ˆã«ç”¨èªžã‚’ã—ã£ã‹ã‚Šç†è§£ã—ã¦ãŠãã¨ã€ã‚ã¨ã¯æ–‡è„ˆã§å‹•è©žã‹åè©žã‹ã‚’åˆ¤æ–ã§ãã‚‹ã¯ãšãªã®ã§ã€ æ··ä¹±ã—ãªã„ã‚ˆã†ã«ä¸å¯§ã«è§£èª¬ã—ã¦è¡Œãã¾ã™ã€‚ ãƒªãƒ“ã‚¸ãƒ§ãƒ³Â¶ ï¼‘å›žã®ã‚³ãƒŸãƒƒãƒˆã§ä¿å˜ã•ã‚Œã‚‹æƒ…å ±ã‚’ã¾ã¨ã‚ãŸã‚‚ã®ã§ã™ã€‚ï¼‘å›žã‚³ãƒŸãƒƒãƒˆã™ã‚‹ãŸã³ã«ã€æ–°ã—ã„ãƒªãƒ“ã‚¸ãƒ§ãƒ³ãŒã²ã¨ã¤ä½œã‚‰ã‚Œã¾ã™ã€‚ ã€Œãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã€ã¨å‘¼ã°ã‚Œã‚‹ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚ã¾ãŸã€ã€Œã‚³ãƒŸãƒƒãƒˆã€(åè©ž)ã‚’ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®æ„å‘³ã§ä½¿ã†ã“ã¨ã‚‚ã‚ã‚Šã¾ã™ã€‚ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã«å«ã¾ã‚Œã‚‹æƒ…å ±ã¯ã€ã“ã‚“ãªã‹ã‚“ã˜ã§ã™ã€‚ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã®ID ã©ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã€ã©ã®ã‚ˆã†ã«å¤‰æ›´ã•ã‚ŒãŸã‹ ã‚³ãƒŸãƒƒãƒˆã—ãŸãƒ¦ãƒ¼ã‚¶ ã‚³ãƒŸãƒƒãƒˆã—ãŸæ—¥ä»˜ ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ è¦ª(ã²ã¨ã¤å‰)ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³ ãƒ–ãƒ©ãƒ³ãƒÂ¶ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç©ã¿é‡ãã‚‹ã“ã¨ã§ã€é–‹ç™ºãŒé€²ã‚“ã§ã„ãã¾ã™ã€‚ã“ã®ã€ä¸€é€£ã®ãƒªãƒ“ã‚¸ãƒ§
aroma_black 2011/11/19
bazaar

DVCS
ãƒªãƒ³ã‚¯
Veracity - åˆ†æ•£ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’åŸºç›¤ã¨ã™ã‚‹æ–° DVCS
Spring Bootã«ã‚ˆã‚‹APIãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰æ§‹ç¯‰å®Ÿè·µã‚¬ã‚¤ãƒ‰ ç¬¬2ç‰ˆ ä½•åƒäººã‚‚ã®é–‹ç™ºè€…ãŒã€InfoQã®ãƒŸãƒ‹ãƒ–ãƒƒã‚¯ã€ŒPractical Guide to Building an API Back End with Spring Bootã€ã‹ã‚‰ã€Spring Bootã‚’ä½¿ã£ãŸREST APIæ§‹ç¯‰ã®åŸºç¤Žã‚’å¦ã‚“ã ã€‚ã“ã®æœ¬ã§ã¯ã€å‡ºç‰ˆæ™‚ã«æ–°ã—ããƒªãƒªãƒ¼ã‚¹ã•ã‚ŒãŸãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã‚ã‚‹ Spring Boot 2 ã‚’ä½¿ç”¨ã—ã¦ã„ã‚‹ã€‚ã—ã‹ã—ã€Spring Boot3ãŒæœ€è¿‘ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã€é‡è¦ãªå¤‰...
aroma_black 2011/07/26
dvcs
ãƒªãƒ³ã‚¯
svnã‹ã‚‰ã®åˆ‡ã‚Šæ›¿ãˆå…ˆã«bzrã‚’æ¤œè¨Žã™ã‚‹ãªã©ï¼ˆæœ€çµ‚çš„ã«ã¯hgã«ãªã£ãŸâ€¥ï¼‰
Takumi IINO @troter bzrã£ã¦è‡ªåˆ†ã®ãƒãƒ¼ã‚«ãƒ«ã«ä»»æ„ã®ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œã‚‹å ´åˆã£ã¦ã€ãƒãƒ¼ã‚«ãƒ«ã®å…±æœ‰ãƒ¬ãƒã‚¸ãƒˆãƒªã‚’ä½œã£ã¦ãã“ã«ä½œæ¥å¯¾è±¡ãƒ–ãƒ©ãƒ³ãƒã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã—ã¦ã€ãã®ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã‹ã‚‰ãƒãƒ¼ã‚«ãƒ«ã®å…±æœ‰ãƒ¬ãƒã‚¸ãƒˆãƒªã«ãƒˆãƒ”ãƒƒã‚¯ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œã‚‹ã£ã¦ä½œæ¥ã‚’ã™ã‚‹ã®ã‹ã€‚ã“ã†ã„ã†ç‚¹ã¯hgã¨ã‹gitã¨ã‹ã®æ–¹ãŒã„ã„ãªãã€‚å®¹é‡çš„ã« 2011-01-19 13:33:26 Takumi IINO @troter ã€Œå…±æœ‰ãƒ¬ãƒã‚¸ãƒˆãƒªã¨ãƒ–ãƒ©ãƒ³ãƒ(Repository tree)ã€ã¨ã€Œã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ¼ãƒ³(Standalone tree)ã€ã®é•ã„ã£ã¦ã€å±¥æ´ãªã©ã®æƒ…å ±ã‚’å…±æœ‰ã™ã‚‹ã‹å€‹åˆ¥ã«æŒã¤ã‹ã®é•ã„ï¼Ÿã€‚ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ¼ãƒ³ã¯ãƒ‡ã‚£ã‚¹ã‚¯é£Ÿã¹ã‚‹ã€‚å…±æœ‰ãƒ¬ãƒã‚¸ãƒˆãƒªã¯gitã®ãƒ–ãƒ©ãƒ³ãƒã«è¿‘ã„äº‹ãŒã§ãã‚‹ã€‚å®Ÿä½“ãŒã‚ã‚‹ã‘ã©ã€‚ 2011-01-19 13:37:36 Takumi IINO @troter æ¬¡ã®ã‚ˆã†ãªæ“ä½œã‚’ã—ãŸå ´åˆã‚’æƒ³å®š: mkdi
aroma_black 2011/07/19
bzr

dvcs
ãƒªãƒ³ã‚¯
EmacsWiki: Bzr Quick Start For Emacs Devs
Emacs uses Git as its version control system since 2014-11-12. This page is therefore out of date and of mainly historical interest. Refer instead to: GitForEmacsDevsGitQuickStartForEmacsDevsBazaar quick start guide for Emacs DevelopersEmacs now uses Bazaar as its version control system. If you are an Emacs contributor without experience using Bazaar in particular and Distributed Version Control S
aroma_black 2011/07/19
Emacsã®bzré‹ç”¨ä¾‹

dvcs
ãƒªãƒ³ã‚¯
A Guide to Branching in Mercurial / Steve Losh
Posted on August 30th, 2009. I've been hanging out in the #mercurial and #bitbucket channels on freenode a lot lately, and I've noticed a topic that comes up a lot is "how does Mercurial's branching differ from git's branching?" A while ago Nick Quaranto and I were talking about Mercurial and git's branching models on Twitter and I wrote out a quick longreply about the main differences. Since then
aroma_black 2011/06/30
Mercurialã«ãŠã‘ã‚‹ãƒ–ãƒ©ãƒ³ãƒã«ã¤ã„ã¦ã€‚

mercurial

dvcs
ãƒªãƒ³ã‚¯
http://atnd.org/events/17060
aroma_black 2011/06/30
å‚åŠ è¡¨æ˜Ždone #dvcs_kyoto

event

äº¬éƒ½

dvcs
ãƒªãƒ³ã‚¯
1