{"provider_name":"Hatena Blog","categories":["golang","git"],"title":"\u6bce\u56dego.sum\u306econflict\u3092\u89e3\u6d88\u3059\u308b\u306e\u304c\u3064\u3089\u3059\u304e\u308b\u306e\u3067\u3001.gitattributes\u3067union merge driver\u3092\u4f7f\u3046\u3088\u3046\u6307\u5b9a\u3059\u308b","author_name":"kiririmode","published":"2021-02-14 11:51:39","type":"rich","author_url":"https://blog.hatena.ne.jp/kiririmode/","version":"1.0","description":"Golang\u306e\u30c4\u30fc\u30eb\u3092\u30c1\u30fc\u30e0\u3067\u958b\u767a\u3057\u3066\u3044\u308b\u306e\u3067\u3059\u304c\u3001Merge Request\u3092merge\u3059\u308b\u5ea6\u306bgo.sum\u3068\u306econflict\u304c\u767a\u751f\u3059\u308b\u3002\u3064\u3089\u3044\u3002 \u5b9f\u306e\u3068\u3053\u308d\u306f\u300c\u3064\u3089\u3059\u304e\u308b\u300d\u3068\u3044\u3046\u307b\u3069\u3064\u3089\u304f\u306f\u306a\u3044\u306e\u3067\u3059\u304c\u3001\u6bce\u56deconflict marker\u306e<<<<<<<\u3092\u6d88\u3057\u3066\u3044\u304f\u4f5c\u696d\u3067\u4eba\u751f\u3092\u6d6a\u8cbb\u3059\u308b\u306e\u306f\u3064\u3089\u3044\u3002 \u3068\u3044\u3046\u308f\u3051\u3067\u3001\u66ab\u5b9a\u7684\u306b.gitattributes\u3067union merge driver\u3092\u6307\u5b9a\u3059\u308b\u904b\u7528\u3092\u306f\u3058\u3081\u3066\u307f\u307e\u3057\u305f\u3002 $ grep go.sum .gitattributes go.sum merge=union .gitattributes\u306b\u3064\u3044\u3066\u306f\u3053\u3053\u3067\u3082\u66f8\u3044\u305f\u3002 \u7406\u5c48 \u30c6\u30ad\u30b9\u30c8\u7cfb\u30d5\u2026","url":"https://kiririmode.hatenablog.jp/entry/20210214/1613271099","provider_url":"https://hatena.blog","blog_url":"https://kiririmode.hatenablog.jp/","blog_title":"\u7406\u7cfb\u5b66\u751f\u65e5\u8a18","width":"100%","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fkiririmode.hatenablog.jp%2Fentry%2F20210214%2F1613271099\" title=\"\u6bce\u56dego.sum\u306econflict\u3092\u89e3\u6d88\u3059\u308b\u306e\u304c\u3064\u3089\u3059\u304e\u308b\u306e\u3067\u3001.gitattributes\u3067union merge driver\u3092\u4f7f\u3046\u3088\u3046\u6307\u5b9a\u3059\u308b - \u7406\u7cfb\u5b66\u751f\u65e5\u8a18\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","image_url":null,"height":"190"}