Git conflicts

Git

• Resolve Git merge conflicts in favor of their changes during a pull

  # In conflicted state
  $ git checkout --theirs . // use thier code from remote repo
  $ git checkout --ours . // use our code form local repo
  $ git add -u . // add file with skip iles that are not under version control
  

Vim

• fugitive.vim: a Git wrapper so awesome

• Fugitive.vim - resolving merge conflicts with vimdiff

  :Gvdiff
  :buffers
  # focus on middle window
  :diffput 2 // see number on :buffers
  :diffput 3 // see number on :buffers
  # ]c next conflict
  # [c previos conflict