git checkout master
config/unicorn.rb: needs merge
error: you need to resolve your current index first
git : explained by animal gifs via @neiltak & @memotv