{"url":"https://kenmaz.hatenadiary.jp/entry/2013/01/31/231527","author_url":"https://blog.hatena.ne.jp/kenmaz/","image_url":"http://cdn-ak.f.st-hatena.com/images/fotolife/k/kenmaz/20130131/20130131222816.png","description":"XCode\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092git\u3067\u7ba1\u7406\u3057\u3066\u3044\u308b\u969b\u306b\u3001merge\u3067\u3044\u308d\u3044\u308d\u3068\u554f\u984c\u304c\u8d77\u304d\u305f\u306e\u3067\u30e1\u30e2\u3063\u3066\u304a\u304f\u3002 XCode\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u4f5c\u308b\u3068\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d5\u30a1\u30a4\u30eb\u30fb\u30b0\u30eb\u30fc\u30d7\u69cb\u9020\u3092\u7ba1\u7406\u3059\u308bxxx.pbxproj\u3068\u3044\u3046\u30d5\u30a1\u30a4\u30eb\u304cXCode\u306b\u3088\u3063\u3066\u81ea\u52d5\u751f\u6210\u3055\u308c\u308b\u3002\u5185\u5bb9\u306fjson\u3063\u307d\u3044\u5f62\u5f0f\uff08property list\uff09\u306e\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u3060\u304c\u3001XCode\u304c\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u69cb\u6210\u3092\u7ba1\u7406\u3059\u308b\u305f\u3081\u306b\u7c21\u6613\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u7684\u306b\u4f7f\u3063\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u306a\u306e\u3067\u3001\u57fa\u672c\u7684\u306b\u306f\u4eba\u9593\u304c\u3044\u3058\u3063\u3061\u3083\u3044\u3051\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u3067\u3042\u308b\u3002 \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0\u3059\u308b\u3068pbxproj\u306e\u5185\u5bb9\u304c\u66f8\u304d\u63db\u308f\u308b\u306e\u3067\u3001git\u306a\u3069\u3067\u30c1\u30fc\u30e0\u958b\u767a\u3059\u308b\u3068\u3069\u3046\u3057\u3066\u3082\u983b\u7e41\u306b\u66f4\u65b0\u2026","type":"rich","provider_name":"Hatena Blog","version":"1.0","published":"2013-01-31 23:15:27","height":"190","title":"git merge\u306ebug\uff1f","blog_title":"kenmaz\u306e\u65e5\u8a18","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fkenmaz.hatenadiary.jp%2Fentry%2F2013%2F01%2F31%2F231527\" title=\"git merge\u306ebug\uff1f - kenmaz\u306e\u65e5\u8a18\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","width":"100%","provider_url":"https://hatena.blog","categories":["\u6280\u8853"],"blog_url":"https://kenmaz.hatenadiary.jp/","author_name":"kenmaz"}