https://inverted-tree.pages.dev/tags/mergetool/ Recent content in Mergetool on Inverted Tree Hugo en-us Sun, 09 Feb 2025 18:30:00 +0000 https://inverted-tree.pages.dev/posts/resolve-merge-conflicts-like-a-pro-with-neovim/ Sun, 09 Feb 2025 18:30:00 +0000 https://inverted-tree.pages.dev/posts/resolve-merge-conflicts-like-a-pro-with-neovim/ <p><img alt="diffview" loading="lazy" src="https://pub-610e38254acb47cea52a77d9d4b58499.r2.dev/blog/312b56e5-diffview.webp"></p> <p>(screenshot taken from diffview.nvim repository)</p> <p>Over the years, I&rsquo;ve gone through so many merge tools - kdiff3, meld, beyond compare, Kaleidoscope. Nvim being my editor of choice, fortunately, has a rich ecosystem of plugins where I can set up an uber merge workflow using <code>diffview.nvim</code> and avoid using external tools altogether.</p> <h5 id="getting-started">Getting started</h5> <p>Make sure you have the latest nvim installed (I have v0.10.4). Although I use <a href="https://lazyvim.org">lazyvim</a> as the base to provide the basic (and some advanced) editor features, I have to set recourse to <em>diffview.nvim</em> to ease my merging process.</p>