{"blog_title":"\u6642\u3005\u3068\u304a\u307e\u308f\u308a","image_url":null,"type":"rich","author_name":"karlley_jp","blog_url":"https://karlley.hatenablog.jp/","categories":["Git","Tips"],"version":"1.0","height":"190","url":"https://karlley.hatenablog.jp/entry/2022/11/08/061744","description":"git\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u3066\u624b\u52d5\u3067\u306f\u306a\u304f\u4e00\u62ec\u3067\u5909\u66f4\u3092\u53cd\u6620\u3057\u305f\u304b\u3063\u305f\u306e\u3067\u3084\u308a\u65b9\u3092\u8abf\u3079\u307e\u3057\u305f\u3002 \u7d50\u8ad6 git checkout --ours \u30d5\u30a1\u30a4\u30eb\u30d1\u30b9\u3001git checkout --theirs \u30d5\u30a1\u30a4\u30eb\u30d1\u30b9 \u3092\u4f7f\u3046\u3002 --ours: \u53d6\u308a\u8fbc\u307f\u5074\u306e\u5909\u66f4\u3092\u6b8b\u3059 --theirs: \u53d6\u308a\u8fbc\u307e\u308c\u308b\u5074\u306e\u5909\u66f4\u3092\u53cd\u6620\u3059\u308b merge \u3068rebase \u3067\u53d6\u308a\u8fbc\u307f\u5074\u306e\u5411\u304d\u9006\u306b\u306a\u308b\u306e\u3067\u6ce8\u610f\u304c\u5fc5\u8981 merge \u30ab\u30ec\u30f3\u30c8\u30d6\u30e9\u30f3\u30c1(branch_B)\u304c\u53d6\u308a\u8fbc\u307f\u5074\u306b\u306a\u308b\u3002 branch_B <- branch_A \u306e\u30a4\u30e1\u30fc\u30b8\u3002 $ git checkout branch_B $ git merge branch_A \u2026","published":"2022-11-08 06:17:44","width":"100%","title":"git\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u6642\u306b\u5909\u66f4\u3092\u4e00\u62ec\u3067\u53cd\u6620\u3059\u308b","provider_url":"https://hatena.blog","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fkarlley.hatenablog.jp%2Fentry%2F2022%2F11%2F08%2F061744\" title=\"git\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u6642\u306b\u5909\u66f4\u3092\u4e00\u62ec\u3067\u53cd\u6620\u3059\u308b - \u6642\u3005\u3068\u304a\u307e\u308f\u308a\" 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/karlley_jp/","provider_name":"Hatena Blog"}