File tree Expand file tree Collapse file tree 1 file changed +11
-2
lines changed
Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -11,14 +11,14 @@ tags:
1111---
1212
1313I like neovim and using git via the cli.
14- Git has some options to customize specific tasks, for instance solving merge conflicts using [ git mergetool] ( https://git-scm.com/docs/git-mergetool ) .
14+ Git has some options to customize specific tasks, for instance solving merge conflicts using [ git mergetool] [ 1 ] .
1515In this blog post I'm going to demonstrate how to setup git and neovim to solve git merge conflicts without the need of an additional GUI tool.
1616
1717## Setup
1818
1919To achieve this there are a few prerequisites:
2020
21- - [ neovim] ( https://github.com/neovim/neovim ) and git are installed
21+ - [ neovim] [ 2 ] and git are installed
2222- a merge conflict to test the config against
2323
2424Next Git's config has to be updated in one of the following places:
@@ -95,3 +95,12 @@ Furthermore git will also place backup files of the originals inside the git rep
9595Git will also ask before any merge conflicted file is opened in a diff, unless ` prompt ` is set to ` false ` .
9696
9797This is just one approach among many, but it works quite well for me.
98+
99+ Further reading:
100+
101+ 1 . [ git manual] [ 1 ] for even more configuration options.
102+ 2 . [ neovim source] [ 3 ] for more cli examples.
103+
104+ [ 1 ] : https://git-scm.com/docs/git-mergetool
105+ [ 2 ] : https://github.com/neovim/neovim
106+ [ 3 ] : https://github.com/neovim/neovim/blob/master/src/nvim/testdir/test_diffmode.vim#L607
You can’t perform that action at this time.
0 commit comments