{"author_name":"kikiki-kiki","blog_title":"\u304b\u3082\u30e1\u30e2","published":"2020-02-21 08:30:00","url":"https://chaika.hatenablog.com/entry/2020/02/21/083000","type":"rich","provider_url":"https://hatena.blog","width":"100%","title":"Git \u30ea\u30e2\u30fc\u30c8\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u5148\u306b\u9032\u3093\u3067push\u3067\u304d\u306a\u304f\u306a\u3063\u3066\u3044\u308b\u306e\u3092\u3069\u3046\u306b\u304b\u3057\u305f\u3044\u3002","height":"190","author_url":"https://blog.hatena.ne.jp/kikiki-kiki/","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fchaika.hatenablog.com%2Fentry%2F2020%2F02%2F21%2F083000\" title=\"Git \u30ea\u30e2\u30fc\u30c8\u306e\u30d6\u30e9\u30f3\u30c1\u304c\u5148\u306b\u9032\u3093\u3067push\u3067\u304d\u306a\u304f\u306a\u3063\u3066\u3044\u308b\u306e\u3092\u3069\u3046\u306b\u304b\u3057\u305f\u3044\u3002 - \u304b\u3082\u30e1\u30e2\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","categories":["git","Tips"],"provider_name":"Hatena Blog","blog_url":"https://chaika.hatenablog.com/","version":"1.0","image_url":"https://images-fe.ssl-images-amazon.com/images/I/41k7xonwpdL._SL160_.jpg","description":"\u8907\u6570\u4eba\u3067\u540c\u3058\u30d6\u30e9\u30f3\u30c1\u306b\u624b\u3092\u5165\u308c\u3066\u3044\u3066\u3001\u624b\u5143\u306e\u30d6\u30e9\u30f3\u30c1\u3067\u5909\u66f4\u3092\u30b3\u30df\u30c3\u30c8\u3057\u3066 push \u3057\u3088\u3046\u3068\u3057\u305f\u3089\u30ea\u30e2\u30fc\u30c8\u306e\u30d6\u30e9\u30f3\u30c1\u304c force push \u3068\u304b\u3067\u5148\u306b\u9032\u3093\u3067\u305d\u306e\u307e\u307e push \u3067\u304d\u306a\u3044\u72b6\u614b\u306b\u306a\u3063\u3066\u3044\u308b\u6642\u306e\u5bfe\u51e6\u65b9\u6cd5\u306e\u30e1\u30e2 --rebase \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u3066 pull \u3059\u308b $ git pull --rebase origin <branch_name> --rebase \u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u3066pull\u3059\u308b\u3068\u30ea\u30e2\u30fc\u30c8\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u53d6\u308a\u8fbc\u3093\u3067 rebase \u3067\u304d\u308b\u3002 \u3064\u307e\u308a\u3001\u3053\u308c\u304c \ud83d\udc47\u3053\u3046\u306a\u308b rebase \u306a\u306e\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3059\u308b\u3053\u3068\u3082\u3042\u308b\u3051\u3069\u3001\u624b\u5143\u306e\u30d6\u30e9\u30f3\u30c1\u540d\u3092\u5909\u3048\u3066\u3001\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u3092 check\u2026"}