[B! merge] takata3ã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

takata3 id:takata3

é–¢é€£ã‚¿ã‚°ã§çµžã‚Šè¾¼ã‚€ (7)

ã‚¿ã‚°ã®çµžã‚Šè¾¼ã¿ã‚’è§£é™¤

mergeã«é–¢ã™ã‚‹takata3ã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (4)

${{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}}

[æ”¹è¨‚ç‰ˆ] 2ã¤ã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã‚’ãƒžãƒ¼ã‚¸ã™ã‚‹ - Qiita
class A attr_accessor [:foo, :bar, :hoge, :baz, :piyo] def initialize(initial_props = {}) initial_props.each do |prop_name, prop_value| self.send("#{prop_name}=", prop_value) end end def to_h hash = {} instance_variables.each do |val| if self.send(val.to_s.delete("@")) hash[val.to_s.delete("@")] = self.send(val.to_s.delete("@")) end end hash end def merge(another) self.class.new(to_h.merge(another
takata3 2020/02/21
ruby

object

merge
ãƒªãƒ³ã‚¯
git logã§ãƒžãƒ¼ã‚¸ã‚³ãƒŸãƒƒãƒˆã®ä¸ã®å¤‰æ›´ã‚’è¡¨ç¤ºã™ã‚‹ - blog.ton-up.net
git logã‚’å®Ÿè¡Œã™ã‚‹ã¨ã‚³ãƒŸãƒƒãƒˆå±¥æ´ãŒè¦‹ã‚Œã¦ã€ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã«ã‚ˆã£ã¦ã¯å„ã‚³ãƒŸãƒƒãƒˆæ¯Žã«ã©ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¤‰æ›´ã•ã‚ŒãŸã®ã‹ãŒè¦‹ã‚ŒãŸã‚Šã™ã‚‹ã€‚ ä¾‹ãˆã°ã€ ã‚’å®Ÿè¡Œã™ã‚Œã°ã€å„ã‚³ãƒŸãƒƒãƒˆæ¯Žã«ã€å¤‰æ›´ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã€‚ã“ã‚“ãªæ„Ÿã˜ã€‚ commit 338d9dde08a13d981e8fd71a973f793be372078d Author: ton <tonton1517@gmail.com> Date: Mon Nov 11 18:38:20 2013 +0900 initial commit. README ã—ã‹ã—ã€ãƒžãƒ¼ã‚¸ã‚³ãƒŸãƒƒãƒˆã®ä¸ã«diffãŒã‚ã‚‹ã¨ã€ã“ã‚ŒãŒè¡¨ç¤ºã•ã‚Œãªã„ã€‚ä»¥ä¸‹å†ç¾ã¨è§£æ±ºç–ã€‚ å†ç¾ ç¾åœ¨ã¯masterãƒ–ãƒ©ãƒ³ãƒã§ä¸Šè¨˜ã®ãƒã‚°ã®çŠ¶æ…‹ã€‚ã‚³ãƒŸãƒƒãƒˆã¯1ã¤ã ã‘ã§READMEã¨ã„ã†ç©ºã®ãƒ•ã‚¡ã‚¤ãƒ«ã ã‘ã€‚ 1. æ–°ã—ã„ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œã£ã¦é©å½“ã«ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ã€‚ $git checkout -b test-branc
takata3 2016/07/19
git

log

merge
ãƒªãƒ³ã‚¯
Gitãƒžãƒ¼ã‚¸ã®åŸºæœ¬ã€€ãƒžãƒ¼ã‚¸ãƒ»ç«¶åˆãƒ»ç«¶åˆè§£æ±ºãƒ»ãƒžãƒ¼ã‚¸ã—ãªãŠã— - Qiita
# topic1,topic2ã®ãƒ–ãƒ©ãƒ³ãƒãŒmasterã«ãªã„ã‚³ãƒŸãƒƒãƒˆã‚’å«ã‚“ã§ã„ã‚‹äº‹ã‚’ç¢ºèª $ git show-branch * [master] a ! [topic1] b ! [topic2] c --- + [topic2] c + [topic1] b *++ [master] a #ãƒžãƒ¼ã‚¸å®Ÿè¡Œ $ git merge topic1 topic2 Fast-forwarding to: topic1 Trying simple merge with topic2 Merge made by the 'octopus' strategy. b | 1 + c | 1 + 2 files changed, 2 insertions(+) create mode 100644 b create mode 100644 c #ãƒžãƒ¼ã‚¸å¾Œã«ãƒ–ãƒ©ãƒ³ãƒã®çŠ¶æ…‹ã‚’ç¢ºèªã™ã‚‹ã¨ã€topic1,2ã®å¤‰æ›´ãŒ
takata3 2016/02/05
git

merge

Conflict
ãƒªãƒ³ã‚¯
gitã§ãƒžãƒ¼ã‚¸ã¨ã‹diffã¨ã‹ã‚³ãƒŸãƒƒãƒˆã¾ã¨ã‚ã¦pushã™ã‚‹ã¨ã‹ - ikeike443ã®ãƒ–ãƒã‚°
ä»Šã¾ã§ã‚‚githubã«pushã™ã‚‹ãŸã‚ã ã‘ã«gitã¯ä½¿ã£ã¦ãŸã‚“ã ã‘ã©ã€æœ€è¿‘ä»–äººã¨å…±åŒä½œæ¥ã™ã‚‹ã‚ˆã†ã«ãªã£ã¦ã€çœŸé¢ç›®ã«gitã‚’å¦ã³å§‹ã‚ãŸã€‚ ã¨ã‚Šã‚ãˆãšä»Šæ—¥ã‚ã‹ã£ãŸã“ã¨ã€‚ å›°ã£ãŸã‚‰ git reflog ã—ã‚ï¼ ã¨ã„ã†ã“ã¨ã§çµ‚ã‚ã‚Šãªã‚“ã ã‘ã©ã€ä¸€å¿œä»¥ä¸‹ã«ãƒ¡ãƒ¢çš„ã«æ›¸ã„ã¦ãŠãã€‚ ãƒ„ãƒƒã‚³ãƒŸå¤§æ“è¿Žã¨ã„ã†ã‹ã€ã„ã‚ã„ã‚æ•™ãˆã¦æ¬²ã—ã„ã®ã§ã‚€ã—ã‚ãƒ„ãƒƒã‚³ãƒ³ã§ãã ã•ã„ã€‚ã€‚ è‡ªåˆ†ã®ä½œæ¥ã¯ã“ã¾ã‚ã«commitã—ãŸã„ã‘ã©ã€å…±åŒãƒªãƒã‚¸ãƒˆãƒªã«ã¯æ„å‘³ã®ã‚ã‚‹å˜ä½ã§pushã—ãŸã„ ã“ã‚“ãªé¢¨ã«ã‚„ã‚Œã°ã„ã„ã®ã‹ãªã¨ã„ã†æ„Ÿè§¦ã‚’æŒã£ãŸã€‚ ä½œæ¥ãƒ–ãƒ©ãƒ³ãƒï¼ˆbranch1ï¼‰ã‚’ä½œã‚‹ã€‚ $ git branch branch1 ãƒ–ãƒ©ãƒ³ãƒã‚’åˆ‡ã‚Šæ›¿ãˆã‚‹ $ git checkout branch1 ã§ã€ä½œæ¥ãƒ–ãƒ©ãƒ³ãƒã§ã„ã‚ã„ã‚ä½œæ¥ã—ã¦ã‚³ãƒŸãƒƒãƒˆã‚’ç©ã¿é‡ããŸå¾Œã€ master ã«åˆ‡ã‚Šæ›¿ãˆã‚‹ $ git checkout master ä½œæ¥ãƒ–ãƒ©ãƒ³ãƒã®å¤‰æ›´ã‚’ãƒžãƒ¼ã‚¸ã™ã‚‹
takata3 2015/12/15
git

diff

reflog

merge
ãƒªãƒ³ã‚¯
1