2011-10-24
keep either file in merge conflicts
git checkout --theirs
git