{"blog_url":"https://haayaaa.hatenablog.com/","height":"190","width":"100%","image_url":null,"type":"rich","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fhaayaaa.hatenablog.com%2Fentry%2F2019%2F05%2F08%2F131333\" title=\"\u30ea\u30e2\u30fc\u30c8\u306emaster\u306b\u9593\u9055\u3048\u3066merge\u3057\u3066\u3057\u307e\u3063\u305f\u6642 - haayaaa\u2019s diary\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","author_url":"https://blog.hatena.ne.jp/haayaaa/","provider_url":"https://hatena.blog","published":"2019-05-08 13:13:33","blog_title":"haayaaa\u2019s diary","categories":["Rails","git","\u30a8\u30e9\u30fc\u89e3\u6c7a","\u5171\u540c\u958b\u767a"],"version":"1.0","title":"\u30ea\u30e2\u30fc\u30c8\u306emaster\u306b\u9593\u9055\u3048\u3066merge\u3057\u3066\u3057\u307e\u3063\u305f\u6642","provider_name":"Hatena Blog","author_name":"haayaaa","url":"https://haayaaa.hatenablog.com/entry/2019/05/08/131333","description":"\u30ea\u30e2\u30fc\u30c8\u306emaster\u306b\u9593\u9055\u3048\u3066merge\u3057\u3066\u3057\u307e\u3044\u3001\u3081\u3061\u3083\u304f\u3061\u3083\u7126\u308b\u4e8b\u614b\u304c\u3042\u308a\u307e\u3057\u305f\u3002 \u5225\u306b\u554f\u984c\u306e\u3042\u308b\u5185\u5bb9\u3092merge\u3057\u3066\u3057\u307e\u3063\u305f\u8a33\u3067\u306f\u306a\u3044\u306e\u3067\u3059\u304c\u3001\u660e\u5f8c\u65e5merge\u3057\u307e\u3057\u3087\u3046\u3068\u8a71\u3057\u3066\u3044\u305f\u5185\u5bb9\u3060\u3063\u305f\u306e\u3067\u7126\u308a\u307e\u3057\u305f\u3002 \u305d\u306e\u6642\u306e\u624b\u9806\u306b\u3064\u3044\u3066\u307e\u3068\u3081\u3066\u304a\u304d\u307e\u3059\u3002 \u624b\u9806 \u2460\u9593\u9055\u3048\u3066merge\u3057\u3066\u3057\u307e\u3063\u305f\u30b3\u30df\u30c3\u30c8\u306e\u53f3\u306b\u3042\u308bRevert\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af \u2461\u3059\u308b\u3068merge\u3057\u305f\u5185\u5bb9\u3092\u53d6\u308a\u6d88\u3059\u30d7\u30eb\u30ea\u30af\u304c\u4f5c\u6210\u3067\u304d\u308b\u306e\u3067\u4f5c\u6210\u3059\u308b \u2462\u4f5c\u6210\u3057\u305f\u30d7\u30eb\u30ea\u30af\u3092merge\u3059\u308b \u3053\u308c\u3067\u9593\u9055\u3048\u3066merge\u3057\u3066\u3057\u307e\u3063\u305f\u5185\u5bb9\u304c\u53d6\u308a\u6d88\u3055\u308c\u307e\u3059\uff01\uff01 \u307d\u3061\u307d\u3061\u30dc\u30bf\u30f3\u3092\u62bc\u3059\u3060\u3051\u3067\u3057\u305f\u306e\u3067\u7c21\u5358\u3067\u3057\u305f\u3002\u3002\u3002\uff01\uff01 Revert\u3059\u308b\u524d\u3068\u540c\u3058\u30d7\u30eb\u30ea\u30af\u2026"}