{"description":"\u4eca\u5e74\u59cb\u3081\u3066\u300c\u524d\u306b\u5ddd\u304c\u3042\u308b\u30db\u30c6\u30eb\u300d\u3068\u300c\u304a\u5893\u3092\u901a\u308b\u3068\u8fd1\u9053\u306a\u30db\u30c6\u30eb\u300d\u304c\u540c\u4e00\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3067\u3042\u308b\u3053\u3068\u3092\u7406\u89e3\u3057\u305f\u3002\u6700\u8fd1\u5ddd\u304c\u3042\u308b\u65b9\u3067\u3084\u3063\u3066\u3044\u306a\u3044\u3068\u601d\u3063\u3066\u3044\u305f\u3089\u8fd1\u9053\u3092\u899a\u3048\u3066\u6b63\u9762\u304b\u3089\u30d0\u30b9\u3067\u6765\u306a\u3044\u3088\u3046\u306b\u306a\u3063\u305f\u305b\u3044\u3060\u3063\u305f\u3002 Merge (revision control) - Wikipedia, the free encyclopedia\u30023-way merge \u30dd\u30a4\u30f3\u30c8\uff1d\u30d6\u30af\u30de\u6570\u00d7\u65e5\u6570^n (n = 0, 1, 2) \u30bb\u30ec\u30af\u30c8\u30d6\u30af\u30de \u4e00\u6642\u7684 v.s. \u9577\u671f\u7684 \u305f\u304f\u3055\u3093\u3042\u308b\u306e\u3067\u305f\u3081\u305a\u306b\u6d41\u3059 Nicolith \u3050\u305f\u3050\u305f\uff08\u4eee) \u5358\u5bff\u547d\u30aa\u30d6\u30b8\u30a7\u30af\u30c8 \u30ea\u30fc\u30b8\u30e7\u30f3\u63a8\u8ad6\u3068\u30a8\u30b9\u30b1\u30fc\u30d7\u89e3\u6790 \u300c256k\u306f\u72ed\u3044\u3068\u3044\u3046\u304c\u3001\u30ec\u30b8\u30b9\u30bf\u3068\u3057\u2026","published":"2009-01-13 13:14:01","blog_title":"\u897f\u5c3e\u6cf0\u548c\u306e\u306f\u3066\u306a\u30c0\u30a4\u30a2\u30ea\u30fc","type":"rich","version":"1.0","url":"https://nishiohirokazu.hatenadiary.org/entry/20090113/1231820041","height":"190","author_name":"nishiohirokazu","categories":[],"width":"100%","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fnishiohirokazu.hatenadiary.org%2Fentry%2F20090113%2F1231820041\" title=\"\u30d7\u30ed\u30b7\u30f3\u65e5\u8a181\u65e5\u76ee - \u897f\u5c3e\u6cf0\u548c\u306e\u306f\u3066\u306a\u30c0\u30a4\u30a2\u30ea\u30fc\" 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/nishiohirokazu/","image_url":null,"provider_url":"https://hatena.blog","blog_url":"https://nishiohirokazu.hatenadiary.org/","provider_name":"Hatena Blog","title":"\u30d7\u30ed\u30b7\u30f3\u65e5\u8a181\u65e5\u76ee"}