{"author_name":"mahou_ptr","type":"rich","url":"https://mahou-ptr.hatenablog.com/entry/2024/04/24/221008","blog_title":"\u30b2\u30fc\u30e0\u4f5c\u308a\u306f\u697d\u3057\u3044","height":"190","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fmahou-ptr.hatenablog.com%2Fentry%2F2024%2F04%2F24%2F221008\" title=\"\u3010Git\u3011\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u3089 conflict \u6b4c\u3044\u305f\u304b\u3063\u305f - \u30b2\u30fc\u30e0\u4f5c\u308a\u306f\u697d\u3057\u3044\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","provider_name":"Hatena Blog","width":"100%","blog_url":"https://mahou-ptr.hatenablog.com/","version":"1.0","published":"2024-04-24 22:10:08","description":"\u306f\u3058\u3081\u306b git merge \u3067 \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u3089 conflict\u6b4c\u3044\u305f\u304f\u306a\u3044\u3067\u3059\u304b\uff1f \u8272\u3005\u8abf\u3079\u3066\u3044\u308b\u306e\u3067\u3059\u304c\u3001\u305f\u3076\u3093\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u30d5\u30c3\u30af\u3059\u308b\u65b9\u6cd5\u306f\u306a\u3044\u306e\u3067 \u4ed5\u65b9\u306a\u3044\u304b\u3089\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u5f8c\u306e\u30b3\u30df\u30c3\u30c8\u6642\u306b\u30d5\u30c3\u30af\u3067\u59a5\u5354\u3057\u307e\u3059\u3002 \u2191\u3044\u3044\u65b9\u6cd5\u304c\u3042\u3063\u305f\u3089\u6559\u3048\u3066\u304f\u3060\u3055\u3044\u3002 GitHooks pre-commit .git/hooks/pre-comit\u306e\u30b9\u30af\u30ea\u30d7\u30c8\u3092\u4f5c\u6210\u3057\u307e\u3059 #!/bin/bash # \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u767a\u751f\u3057\u3066\u3044\u308b\u304b\u3069\u3046\u304b\u3092\u78ba\u8a8d if [ -f \"$(git rev-parse --git-path MERGE_HEAD)\" ]; then echo \"conflict\u6b4c\u3044\u307e\u3059\u3002\u30ba\u30a9\u30fc\u30eb\u2026","image_url":null,"provider_url":"https://hatena.blog","title":"\u3010Git\u3011\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u3089 conflict \u6b4c\u3044\u305f\u304b\u3063\u305f","author_url":"https://blog.hatena.ne.jp/mahou_ptr/","categories":["\u30cd\u30bf","Git"]}