{"blog_url":"https://gregory-igehy.hatenadiary.com/","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fgregory-igehy.hatenadiary.com%2Fentry%2F2016%2F09%2F03%2F202259\" title=\"UnityYAMLMerge \u306e\u8a2d\u5b9a - Gregory Igehy\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","description":"\u4e0b\u306e\u30d1\u30b9\u306b\u3042\u308b\u5834\u5408 C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe TortoiseGit \u306e\u8a2d\u5b9a \u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u4f55\u3082\u306a\u3044\u3068\u3053\u308d\u3067\u53f3\u30af\u30ea\u30c3\u30af -> TortoiseSVN -> \u8a2d\u5b9a -> \u30de\u30fc\u30b8\u30c4\u30fc\u30eb -> \u9ad8\u5ea6\u306a\u8a2d\u5b9a \u8ffd\u52a0\u3092\u62bc\u3059 \u62e1\u5f35\u5b50\u3092 .unity \u3068\u66f8\u304d\u8fbc\u307f, \u4e0b\u306e\u8a18\u8ff0\u3092\u8ffd\u52a0 \u540c\u69d8\u306b .prefab \u306b\u3064\u3044\u3066\u3082\u540c\u3058\u3053\u3068\u3092\u884c\u3046 C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe merge -p %base %theirs %mine %merged\u2026","url":"https://gregory-igehy.hatenadiary.com/entry/2016/09/03/202259","provider_name":"Hatena Blog","author_url":"https://blog.hatena.ne.jp/gregory-igehy/","author_name":"gregory-igehy","blog_title":"Gregory Igehy","image_url":"https://cdn-ak.f.st-hatena.com/images/fotolife/g/gregory-igehy/20160903/20160903202121.png","version":"1.0","type":"rich","width":"100%","height":"190","categories":[],"provider_url":"https://hatena.blog","title":"UnityYAMLMerge \u306e\u8a2d\u5b9a","published":"2016-09-03 20:22:59"}