coc-git

coc-git copied to clipboard

I use the following in my .gitconfig more info here

[merge]
  conflictstyle = diff3

This causes the commands:

  nnoremap g1 <Plug>(coc-git-keepcurrent)
  nnoremap g2 <Plug>(coc-git-keepboth)
  nnoremap g3 <Plug>(coc-git-keepincoming)

to leave the common-ancestor section untouched

https://user-images.githubusercontent.com/1330872/114862227-f00f9200-9df6-11eb-831b-38966e84acc1.mov

Hope there will be a setting or smth that takes conflictstyle into account

I created the following shortcuts as a vim-implementation, however would love to see this as part of coc-vim

  nnoremap g1 :<C-U>call MergeKeepLeft()<CR>
  nnoremap g2 :<C-U>call MergeKeepBoth()<CR>
  nnoremap g3 :<C-U>call MergeKeepRight()<CR>

  function! MergeKeepLeft()
    let lastsearch = @/
    let @/ = '<<<<<<<'
    execute "normal! ?\<cr>dd"

    let @/ = '|||||||'
    execute "normal! /\<cr>V"

    let @/ = '>>>>>>>'
    execute "normal! /\<cr>d"

    let @/ = lastsearch
  endfunction

  function! MergeKeepBoth()
    let lastsearch = @/
    let @/ = '<<<<<<<'
    execute "normal! ?\<cr>dd"

    let @/ = '|||||||'
    execute "normal! /\<cr>V"

    let @/ = '======='
    execute "normal! /\<cr>d"

    let @/ = '>>>>>>>'
    execute "normal! /\<cr>dd"

    let @/ = lastsearch
  endfunction

  function! MergeKeepRight()
    let lastsearch = @/
    let @/ = '<<<<<<<'
    execute "normal! ?\<cr>V"

    let @/ = '======='
    execute "normal! /\<cr>d"

    let @/ = '>>>>>>>'
    execute "normal! /\<cr>dd"

    let @/ = lastsearch
  endfunction