{"height":"190","blog_title":"\u30dd\u30f3\u30b3\u30c4\u30a8\u30f3\u30b8\u30cb\u30a2\u306e\u3054\u3058\u3083\u3063\u307a\u958b\u767a\u65e5\u8a18\u3002","description":"\u30e1\u30e2\u30c4\u30fc\u30eb\u3067\u3042\u308bObsidian\u3092\u4f7f\u3063\u3066\u3044\u307e\u3059\u3002\u30c7\u30fc\u30bf\u30b9\u30c8\u30a2\u3068\u3057\u3066GitHub\u3092\u4f7f\u3063\u3066\u3044\u308b\u306e\u3067\u3059\u304c\u3001git\u3068\u3044\u3046\u3053\u3068\u3067\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u304d\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059\u3002 PC\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u304d\u308b\u5206\u306b\u306f\u3069\u3046\u306b\u304b\u3067\u304d\u308b\u306e\u3067\u3044\u3044\u306e\u3067\u3059\u304c\u3001\u30b9\u30de\u30db\u3060\u3068\u89e3\u6d88\u304c\u96e3\u3057\u3044\u3002\u306a\u306e\u3067\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6d88\u3092\u3057\u305f\u3068\u304d\u306e\u30e1\u30e2\u3092\u30d6\u30ed\u30b0\u8a18\u4e8b\u3068\u3057\u3066\u6b8b\u3057\u3066\u304a\u3053\u3046\u3068\u601d\u3044\u307e\u3059\u3002 \u3061\u306a\u307f\u306b\u3001Android\u3092\u4f7f\u3063\u3066\u3044\u307e\u3059\u3002 \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u89e3\u6d88\u30e1\u30e2 \u53c2\u8003\u30b5\u30a4\u30c8\u306f\u3053\u3061\u3089\u306b\u306a\u308a\u307e\u3059\u3002 qiita.com Termux\u30a2\u30d7\u30ea\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb play.google.com $ pkg update $ pkg upgrade $ termux-setup-s\u2026","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fwww.pnkts.net%2F2025%2F07%2F13%2Fobsidian-git-conflict\" title=\"Obsidian git\u304c\u30b9\u30de\u30db\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u3068\u304d\u306e\u5bfe\u5fdc\u30e1\u30e2 - \u30dd\u30f3\u30b3\u30c4\u30a8\u30f3\u30b8\u30cb\u30a2\u306e\u3054\u3058\u3083\u3063\u307a\u958b\u767a\u65e5\u8a18\u3002\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","version":"1.0","author_url":"https://blog.hatena.ne.jp/ponkotsu0605/","published":"2025-07-13 00:27:15","title":"Obsidian git\u304c\u30b9\u30de\u30db\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u3068\u304d\u306e\u5bfe\u5fdc\u30e1\u30e2","type":"rich","provider_name":"Hatena Blog","categories":["obsidian"],"image_url":"https://cdn-ak.f.st-hatena.com/images/fotolife/p/ponkotsu0605/20250713/20250713002630.png","url":"https://www.pnkts.net/2025/07/13/obsidian-git-conflict","width":"100%","provider_url":"https://hatena.blog","blog_url":"https://www.pnkts.net/","author_name":"ponkotsu0605"}