basyura https://blog.hatena.ne.jp/basyura/ basyura's blog https://blog.basyura.org/ vcs 8.11 で Merge Conflict Resolution をリリース。 8.13 で Merge Conflict Editor をリリース。 ただし、これらを使用するには条件がある。 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… 190 <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 は日本語が通らない - 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> Hatena Blog https://hatena.blog 2016-11-05 17:42:20 rich https://blog.basyura.org/entry/2016/11/05/174220 1.0 100%