{"published":"2013-01-08 19:51:21","description":"\u4e8b\u60c5\u306b\u3088\u308a\u65e2\u306b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u8ffd\u52a0\u3055\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5909\u66f4\u3057\u305f\u304f\u306a\u3063\u305f\u3002\u5177\u4f53\u7684\u306b\u306f Sencha Touch 2 \u3067\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u3064\u304f\u308b\u3068\u304d\u306b\u30b9\u30ad\u30e3\u30c3\u30d5\u30a9\u30fc\u30eb\u30c9\u3068\u3057\u3066 hoge.js \u307f\u305f\u3044\u306b\u3044\u3063\u3071\u3044\u914d\u7f6e\u3057\u3061\u3083\u3063\u3066\u305f\u3051\u3069\u3001\u5b9f\u969b\u306f Hoge.js \u3068\u5927\u6587\u5b57\u306b\u3057\u306a\u3044\u3068\u8a8d\u8b58\u3055\u308c\u306a\u3044\u306e\u3067\u305d\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u554f\u984c\u3092\u89e3\u6c7a\u3059\u308b\u3002 \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5909\u66f4\u3057\u305f\u306e\u3067\u30de\u30fc\u30b8\u306b\u5931\u6557\u3057\u305f \u4ee5\u4e0b\u30ed\u30b0 [atas@ ~/work/(hg)-[ticket]-] hg merge default abort: case-folding collision between hoge/app/controller/Main.js a\u2026","provider_url":"https://hatena.blog","title":"Mercurial \u3067 \u65e2\u306b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5165\u3063\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5909\u66f4\u3059\u308b","height":"190","blog_url":"https://atasatamatara.hatenablog.jp/","url":"https://atasatamatara.hatenablog.jp/entry/2013/01/08/195121","author_name":"atasatamatara","categories":["Mercurial"],"html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fatasatamatara.hatenablog.jp%2Fentry%2F2013%2F01%2F08%2F195121\" title=\"Mercurial \u3067 \u65e2\u306b\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5165\u3063\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5909\u66f4\u3059\u308b - \u61a7\u308c\u99c6\u52d5\u958b\u767a\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","provider_name":"Hatena Blog","type":"rich","version":"1.0","blog_title":"\u61a7\u308c\u99c6\u52d5\u958b\u767a","width":"100%","author_url":"https://blog.hatena.ne.jp/atasatamatara/","image_url":null}