Quick usage of
:Gita chaperone of vim-gita to solve conflict
chaperoneaction or hit
!!on a conflicted file
dol, dorin WORKTREE to obtain a diff chunk from OURS (:2, left) or THEIRS (:3, right)
dpin OURS or THEIRS to put a diff chunk to WORKTREE
:wto save the changes and perform stage and commit
Note: The version used for the cast is old and it actually open ANCESTOR (:1) and OURS (:2) but OURS (:2) and THEIRS (:3) is a correct behavior.