{"width":"100%","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fcoffee-guhaw.hateblo.jp%2Fentry%2F2025%2F05%2F02%2F000000\" title=\"\u3010git\u3011git pull\u3057\u305f\u3068\u304d\u306bpull.rebase\u95a2\u9023\u306e\u30ef\u30fc\u30cb\u30f3\u30b0\u304c\u51fa\u305f\u3068\u304d - Bus error\u3068Segmentation fault\u306b\u56f0\u3063\u305f\u3089\u898b\u308b\u30d6\u30ed\u30b0\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","type":"rich","published":"2025-05-02 00:00:00","version":"1.0","categories":["\u30b7\u30a7\u30eb\u30b3\u30de\u30f3\u30c9/\u30b7\u30a7\u30eb\u30b9\u30af\u30ea\u30d7\u30c8","git"],"blog_title":"Bus error\u3068Segmentation fault\u306b\u56f0\u3063\u305f\u3089\u898b\u308b\u30d6\u30ed\u30b0","blog_url":"https://coffee-guhaw.hateblo.jp/","title":"\u3010git\u3011git pull\u3057\u305f\u3068\u304d\u306bpull.rebase\u95a2\u9023\u306e\u30ef\u30fc\u30cb\u30f3\u30b0\u304c\u51fa\u305f\u3068\u304d","author_url":"https://blog.hatena.ne.jp/coffee_kabu/","image_url":"https://cdn.image.st-hatena.com/image/square/23ff597bd045490499b097f036afb3ec0665a0d5/backend=imagemagick;height=80;version=1;width=80/https%3A%2F%2Fcdn.user.blog.st-hatena.com%2Fcircle_image%2F88409737%2F1514352962196085","author_name":"coffee_kabu","provider_url":"https://hatena.blog","description":"git pull\u3057\u305f\u3089\u4ee5\u4e0b\u306e\u30ef\u30fc\u30cb\u30f3\u30b0\u3063\u307d\u3044\u3082\u306e\u304c\u51fa\u305f hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint\u2026","height":"190","provider_name":"Hatena Blog","url":"https://coffee-guhaw.hateblo.jp/entry/2025/05/02/000000"}