{"width":"100%","type":"rich","published":"2016-11-05 17:42:20","version":"1.0","categories":["vcs"],"blog_title":"basyura's blog","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fblog.basyura.org%2Fentry%2F2016%2F11%2F05%2F174220\" title=\"GitLab - Merge Conflict Resolution &amp; Merge Conflict Editor \u306f\u65e5\u672c\u8a9e\u304c\u901a\u3089\u306a\u3044 - basyura&#39;s blog\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","description":"8.11 \u3067 Merge Conflict Resolution \u3092\u30ea\u30ea\u30fc\u30b9\u3002 8.13 \u3067 Merge Conflict Editor \u3092\u30ea\u30ea\u30fc\u30b9\u3002 \u305f\u3060\u3057\u3001\u3053\u308c\u3089\u3092\u4f7f\u7528\u3059\u308b\u306b\u306f\u6761\u4ef6\u304c\u3042\u308b\u3002 If the file contains conflict markers that mean we can't parse the file unambiguously, we can't show the sections. We will, however, be able to allow resolving those conflicts in an editor. If the file i\u2026","url":"https://blog.basyura.org/entry/2016/11/05/174220","height":"190","provider_url":"https://hatena.blog","blog_url":"https://blog.basyura.org/","title":"GitLab - Merge Conflict Resolution & Merge Conflict Editor \u306f\u65e5\u672c\u8a9e\u304c\u901a\u3089\u306a\u3044","image_url":null,"author_url":"https://blog.hatena.ne.jp/basyura/","author_name":"basyura","provider_name":"Hatena Blog"}