{"image_url":null,"height":"190","blog_url":"https://piropati.hatenadiary.org/","blog_title":"Mattari Memo","provider_url":"https://hatena.blog","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fpiropati.hatenadiary.org%2Fentry%2F20090122%2F1232604189\" title=\"git pull \u3068\u304b\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u3053\u3063\u305f\u3068\u304d\u306e\u5bfe\u51e6 - Mattari Memo\" 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/piropati/","provider_name":"Hatena Blog","version":"1.0","type":"rich","description":"git pull \u306f\u81ea\u52d5\u3067\u30de\u30fc\u30b8\u3092\u3057\u3066\u304f\u308c\u307e\u3059\u304c\u3001\u305f\u307e\u306b\u89e3\u6c7a\u3067\u304d\u306a\u3044\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\uff08\u885d\u7a81\uff09\u306e\u554f\u984c\u304c\u3042\u308b\u305d\u3046\u3067 \u305d\u308c\u306e\u4fee\u6b63\u306e\u4ed5\u65b9\u306f\u3001\u554f\u984c\u306e\u3042\u3063\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u8a73\u3057\u304f\u66f8\u3044\u3066\u3042\u308a\u307e\u3059 gituser@gitrepo:~/git-dir/mysite$ git pull mysite-remote master remoteuser@192.168.0.112's password: #SSH login Auto-merged templates/myapp/res_list.html CONFLICT (content): Merge conflict in templates/myapp/res_li\u2026","author_name":"piropati","published":"2009-01-22 15:03:09","title":"git pull \u3068\u304b\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u3053\u3063\u305f\u3068\u304d\u306e\u5bfe\u51e6","categories":["diary","memo","git"],"url":"https://piropati.hatenadiary.org/entry/20090122/1232604189","width":"100%"}