{"url":"https://shinshin86.hateblo.jp/entry/2021/05/07/214003","height":"190","author_url":"https://blog.hatena.ne.jp/shinshin86/","categories":["\u5099\u5fd8\u9332","Git"],"image_url":null,"version":"1.0","blog_url":"https://shinshin86.hateblo.jp/","published":"2021-05-07 21:40:03","author_name":"shinshin86","blog_title":"at backyard","provider_name":"Hatena Blog","type":"rich","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fshinshin86.hateblo.jp%2Fentry%2F2021%2F05%2F07%2F214003\" title=\"\u3010Git\u3011Pulling without specifying how to reconcile divergent branches is discouraged. \u3068\u3044\u3046warning\u306e\u5bfe\u5fdc\u306b\u3064\u3044\u3066 - at backyard\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","title":"\u3010Git\u3011Pulling without specifying how to reconcile divergent branches is discouraged. \u3068\u3044\u3046warning\u306e\u5bfe\u5fdc\u306b\u3064\u3044\u3066","width":"100%","provider_url":"https://hatena.blog","description":"\u6700\u8fd1Mac\u5185\u306eGit\u306eversion\u3092\u3042\u3052\u305f\u305b\u3044\u304b\u3001git pull origin main \u306a\u3069\u306e\u30b3\u30de\u30f3\u30c9\u3092\u6253\u3063\u305f\u969b\u306b\u3001\u4e0b\u8a18\u306e\u3088\u3046\u306a\u8b66\u544a\u304c\u51fa\u308b\u3088\u3046\u306b\u306a\u3063\u305f\u3002 hint: Pulling without specifying how to reconcile divergent branches is hint: discouraged. You can squelch this message by running one of the following hint: commands sometime before your next pull: hint: hint: git confi\u2026"}